diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties b/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
index 9616cf856..f54bfeab8 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
@@ -114,15 +114,15 @@ com.arsdigita.forum.disable_page_caching=true
 ;  atoz 
 com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-# ccm-ldn-navigation application
-; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
-; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
-; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
-; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
-com.arsdigita.london.navigation.category_menu_show_grand_children=false
-; com.arsdigita.london.navigation.category_menu_show_nephews=false
-com.arsdigita.london.navigation.default_cat_root_path=/navigation/
-com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp
+# ccm-navigation application
+; com.arsdigita.navigation.category_menu_show_grand_children_min=1
+; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
+com.arsdigita.navigation.category_menu_show_grand_children=false
+; com.arsdigita.navigation.category_menu_show_nephews=false
+com.arsdigita.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_template=/packages/navigation/templates/default.jsp
 
 
 # ccm-ldn-search application
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
index 7f3f0eb2a..348e17bce 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
@@ -36,7 +36,6 @@
         <ccm:application name="ccm-ldn-aplaws"/>
         <ccm:application name="ccm-ldn-atoz"/>
         <ccm:application name="ccm-ldn-dublin"/> 
-        <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>
@@ -44,6 +43,7 @@
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-util"/>
 
+        <ccm:application name="ccm-navigation"/>
         <ccm:application name="ccm-portalworkspace"/>
         <ccm:application name="ccm-themedirector"/>
 
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/web.xml b/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
index f2a9be5f2..dd57af3d3 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/web.xml
@@ -218,11 +218,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -361,7 +361,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties b/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties
index 39afe8c46..17bdb1e24 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties
@@ -114,15 +114,15 @@ com.arsdigita.forum.disable_page_caching=true
 ;  atoz 
 com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-# ccm-ldn-navigation application
-; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
-; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
-; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
-; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
-com.arsdigita.london.navigation.category_menu_show_grand_children=false
-; com.arsdigita.london.navigation.category_menu_show_nephews=false
-com.arsdigita.london.navigation.default_cat_root_path=/navigation/
-com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp
+# ccm-navigation application
+; com.arsdigita.navigation.category_menu_show_grand_children_min=1
+; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
+com.arsdigita.navigation.category_menu_show_grand_children=false
+; com.arsdigita.navigation.category_menu_show_nephews=false
+com.arsdigita.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_template=/packages/navigation/templates/default.jsp
 
 
 # ccm-ldn-search application
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
index 5635eddf3..e6594d33e 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
@@ -67,7 +67,6 @@
         <ccm:application name="ccm-ldn-exporter"/>
         <ccm:application name="ccm-ldn-freeform"/>
         <ccm:application name="ccm-ldn-importer"/>
-        <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-rss"/>
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
@@ -80,6 +79,7 @@
         <ccm:application name="ccm-faq"/>
         <ccm:application name="ccm-forum"/>     
         <ccm:application name="ccm-forum-categorised"/>     
+        <ccm:application name="ccm-navigation"/>
         <ccm:application name="ccm-portalserver"/>
         <ccm:application name="ccm-portalworkspace"/>
         <ccm:application name="ccm-themedirector"/>
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
index f01344d93..0b177ca37 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
@@ -196,11 +196,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -339,7 +339,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
index 7a45e3f43..be33a3367 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
@@ -119,15 +119,15 @@ com.arsdigita.forum.disable_page_caching=true
 ;  atoz 
 com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-# ccm-ldn-navigation application
-; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
-; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
-; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
-; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
-com.arsdigita.london.navigation.category_menu_show_grand_children=false
-; com.arsdigita.london.navigation.category_menu_show_nephews=false
-com.arsdigita.london.navigation.default_cat_root_path=/navigation/
-com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp
+# ccm-navigation application
+; com.arsdigita.navigation.category_menu_show_grand_children_min=1
+; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
+com.arsdigita.navigation.category_menu_show_grand_children=false
+; com.arsdigita.navigation.category_menu_show_nephews=false
+com.arsdigita.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_template=/packages/navigation/templates/default.jsp
 
 
 # ccm-ldn-search application
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
index 63f0bc81c..5dc0fd30a 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
@@ -78,7 +78,6 @@
         <ccm:application name="ccm-ldn-exporter"/>
         <ccm:application name="ccm-ldn-freeform"/>
         <ccm:application name="ccm-ldn-importer"/>
-        <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-rss"/>
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
@@ -86,6 +85,7 @@
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-util"/>
 
+        <ccm:application name="ccm-navigation"/>
         <ccm:application name="ccm-portalserver"/>
         <ccm:application name="ccm-portalworkspace"/>
   <!--  Currently broken. 
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
index 7650112c3..5e92afe9b 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
@@ -218,11 +218,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -361,7 +361,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties b/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
index 5731241b8..1995e1e2b 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
@@ -114,15 +114,15 @@ com.arsdigita.forum.disable_page_caching=true
 ;  atoz 
 com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-# ccm-ldn-navigation application
-; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
-; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
-; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
-; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
-com.arsdigita.london.navigation.category_menu_show_grand_children=false
-; com.arsdigita.london.navigation.category_menu_show_nephews=false
-com.arsdigita.london.navigation.default_cat_root_path=/navigation/
-com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp
+# ccm-navigation application
+; com.arsdigita.navigation.category_menu_show_grand_children_min=1
+; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
+com.arsdigita.navigation.category_menu_show_grand_children=false
+; com.arsdigita.navigation.category_menu_show_nephews=false
+com.arsdigita.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_template=/packages/navigation/templates/default.jsp
 
 
 # ccm-ldn-search application
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/project.xml b/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
index 42613e78d..3eb041b26 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
@@ -60,7 +60,6 @@
         <ccm:application name="ccm-ldn-exporter"/>
         <ccm:application name="ccm-ldn-freeform"/>
         <ccm:application name="ccm-ldn-importer"/>
-        <ccm:application name="ccm-ldn-navigation"/>
         <ccm:application name="ccm-ldn-rss"/>
         <ccm:application name="ccm-ldn-search"/>
         <ccm:application name="ccm-ldn-shortcuts"/>
@@ -81,6 +80,7 @@
 <!--    <ccm:application name="ccm-formbuilder-pdf"/>          -->
         <ccm:application name="ccm-forum"/>     
         <ccm:application name="ccm-forum-categorised"/>     
+        <ccm:application name="ccm-navigation"/>
         <ccm:application name="ccm-portalserver"/>
         <ccm:application name="ccm-portalworkspace"/>
         <!-- Completely untested                               -->
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/web.xml b/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
index f2a9be5f2..dd57af3d3 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/web.xml
@@ -218,11 +218,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -361,7 +361,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties b/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties
index 05c4f929e..ac1dedfcc 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties
@@ -114,15 +114,15 @@ com.arsdigita.forum.disable_page_caching=true
 ;  atoz 
 com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-# ccm-ldn-navigation application
-; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
-; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
-; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
-; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536
-com.arsdigita.london.navigation.category_menu_show_grand_children=false
-; com.arsdigita.london.navigation.category_menu_show_nephews=false
-com.arsdigita.london.navigation.default_cat_root_path=/navigation/
-com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp
+# ccm-navigation application
+; com.arsdigita.navigation.category_menu_show_grand_children_min=1
+; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
+com.arsdigita.navigation.category_menu_show_grand_children=false
+; com.arsdigita.navigation.category_menu_show_nephews=false
+com.arsdigita.navigation.default_cat_root_path=/navigation/
+com.arsdigita.navigation.default_template=/packages/navigation/templates/default.jsp
 
 
 # ccm-ldn-search application
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
index 7650112c3..5e92afe9b 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
@@ -218,11 +218,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -361,7 +361,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->
diff --git a/ccm-ldn-aplaws/doc/app-schemas/app-schemas.html b/ccm-ldn-aplaws/doc/app-schemas/app-schemas.html
index 0b17098ba..f272f248f 100755
--- a/ccm-ldn-aplaws/doc/app-schemas/app-schemas.html
+++ b/ccm-ldn-aplaws/doc/app-schemas/app-schemas.html
@@ -120,7 +120,7 @@ etc.
       &lt;/xs:documentation&gt;
 
       &lt;xs:appinfo&gt;
-        &lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.Root&lt;/gen:class&gt;
+        &lt;gen:class&gt;com.arsdigita.navigation.ui.category.Root&lt;/gen:class&gt;
       &lt;/xs:appinfo&gt;
     &lt;/xs:annotation&gt;
 
@@ -139,7 +139,7 @@ etc.
       &lt;/xs:documentation&gt;
 
       &lt;xs:appinfo&gt;
-        &lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.TopLevel&lt;/gen:class&gt;
+        &lt;gen:class&gt;com.arsdigita.navigation.ui.category.TopLevel&lt;/gen:class&gt;
       &lt;/xs:appinfo&gt;
     &lt;/xs:annotation&gt;
 
@@ -158,7 +158,7 @@ etc.
       &lt;/xs:documentation&gt;
 
       &lt;xs:appinfo&gt;
-        &lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.Siblings&lt;/gen:class&gt;
+        &lt;gen:class&gt;com.arsdigita.navigation.ui.category.Siblings&lt;/gen:class&gt;
       &lt;/xs:appinfo&gt;
     &lt;/xs:annotation&gt;
 
@@ -176,7 +176,7 @@ etc.
       &lt;/xs:documentation&gt;
 
       &lt;xs:appinfo&gt;
-        &lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.Children&lt;/gen:class&gt;
+        &lt;gen:class&gt;com.arsdigita.navigation.ui.category.Children&lt;/gen:class&gt;
       &lt;/xs:appinfo&gt;
     &lt;/xs:annotation&gt;
 
@@ -195,7 +195,7 @@ etc.
       &lt;/xs:documentation&gt;
 
       &lt;xs:appinfo&gt;
-        &lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.Path&lt;/gen:class&gt;
+        &lt;gen:class&gt;com.arsdigita.navigation.ui.category.Path&lt;/gen:class&gt;
       &lt;/xs:appinfo&gt;
     &lt;/xs:annotation&gt;
 
@@ -216,7 +216,7 @@ etc.
       &lt;/xs:documentation&gt;
 
       &lt;xs:appinfo&gt;
-        &lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.Menu&lt;/gen:class&gt;
+        &lt;gen:class&gt;com.arsdigita.navigation.ui.category.Menu&lt;/gen:class&gt;
       &lt;/xs:appinfo&gt;
     &lt;/xs:annotation&gt;
 
@@ -235,7 +235,7 @@ etc.
       &lt;/xs:documentation&gt;
 
       &lt;xs:appinfo&gt;
-        &lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.Hierarchy&lt;/gen:class&gt;
+        &lt;gen:class&gt;com.arsdigita.navigation.ui.category.Hierarchy&lt;/gen:class&gt;
       &lt;/xs:appinfo&gt;
     &lt;/xs:annotation&gt;
 
@@ -298,7 +298,7 @@ contains a summary of top two levels of navigation categories.
       &lt;/xs:documentation&gt;
 
       &lt;xs:appinfo&gt;
-        &lt;gen:class&gt;com.arsdigita.london.navigation.ui.DirectoryComponent&lt;/gen:class&gt;
+        &lt;gen:class&gt;com.arsdigita.navigation.ui.DirectoryComponent&lt;/gen:class&gt;
       &lt;/xs:appinfo&gt;
     &lt;/xs:annotation&gt;
 
diff --git a/ccm-ldn-aplaws/doc/app-schemas/directory.xsd b/ccm-ldn-aplaws/doc/app-schemas/directory.xsd
index cd97da858..6787e10d4 100755
--- a/ccm-ldn-aplaws/doc/app-schemas/directory.xsd
+++ b/ccm-ldn-aplaws/doc/app-schemas/directory.xsd
@@ -15,7 +15,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.DirectoryComponent</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.DirectoryComponent</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
diff --git a/ccm-ldn-aplaws/doc/app-schemas/navigation.xsd b/ccm-ldn-aplaws/doc/app-schemas/navigation.xsd
index 117751e63..696f0f615 100755
--- a/ccm-ldn-aplaws/doc/app-schemas/navigation.xsd
+++ b/ccm-ldn-aplaws/doc/app-schemas/navigation.xsd
@@ -12,7 +12,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Root</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Root</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -31,7 +31,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.TopLevel</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.TopLevel</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -50,7 +50,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Siblings</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Siblings</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -68,7 +68,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Children</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Children</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -87,7 +87,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Path</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Path</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -108,7 +108,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Menu</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Menu</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
@@ -127,7 +127,7 @@
       </xs:documentation>
 
       <xs:appinfo>
-        <gen:class>com.arsdigita.london.navigation.ui.category.Hierarchy</gen:class>
+        <gen:class>com.arsdigita.navigation.ui.category.Hierarchy</gen:class>
       </xs:appinfo>
     </xs:annotation>
 
diff --git a/ccm-ldn-aplaws/src/WEB-INF/aplaws/domain-nav-1.03.xml b/ccm-ldn-aplaws/src/WEB-INF/aplaws/domain-nav-1.03.xml
index 4d722bdea..49a9cc5ea 100755
--- a/ccm-ldn-aplaws/src/WEB-INF/aplaws/domain-nav-1.03.xml
+++ b/ccm-ldn-aplaws/src/WEB-INF/aplaws/domain-nav-1.03.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
-<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" about="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml" key="APLAWS-NAV" title="APLAWS Navigation List" version="1.03" released="2004-03-24">
+<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" 
+                    about="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml" 
+                      key="APLAWS-NAV" 
+                    title="APLAWS Navigation List" 
+                  version="1.03"
+                 released="2004-03-24">
   <terms:term id="1" name="Business" inAtoZ="false"/>
   <terms:term id="1007" name="Jobs and careers" inAtoZ="false"/>
   <terms:term id="1021" name="Legal services" inAtoZ="false"/>
diff --git a/ccm-ldn-aplaws/src/WEB-INF/aplaws/domain-rss-1.00.xml b/ccm-ldn-aplaws/src/WEB-INF/aplaws/domain-rss-1.00.xml
index 087c1b68e..c8a3431ae 100755
--- a/ccm-ldn-aplaws/src/WEB-INF/aplaws/domain-rss-1.00.xml
+++ b/ccm-ldn-aplaws/src/WEB-INF/aplaws/domain-rss-1.00.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" about="http://www.aplaws.org.uk/standards/rss/1.00/termslist.xml" key="APLAWS-RSS" title="APLAWS RSS Feed List" version="1.00" released="2003-01-21">
+<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" 
+                    about="http://www.aplaws.org.uk/standards/rss/1.00/termslist.xml" 
+                      key="APLAWS-RSS" 
+                    title="APLAWS RSS Feed List" 
+                  version="1.00"
+                 released="2003-01-21">
   <terms:term id="1" name="Press Releases" inAtoZ="false"/>
   <terms:term id="2" name="News" inAtoZ="false"/>
   <terms:term id="3" name="Events" inAtoZ="false"/>
diff --git a/ccm-ldn-aplaws/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp b/ccm-ldn-aplaws/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
deleted file mode 100755
index b32819af7..000000000
--- a/ccm-ldn-aplaws/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+++ /dev/null
@@ -1,44 +0,0 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-       xmlns:define="/WEB-INF/bebop-define.tld" 
-         xmlns:show="/WEB-INF/bebop-show.tld"
-	    version="1.2">
-
-  <jsp:directive.page
-    import="com.arsdigita.london.navigation.NavigationModel,
-            com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-
-  <jsp:declaration>
-    NavigationModel model = new CMSNavigationModel();
-  </jsp:declaration>
-
-  <define:page name="itemPage" application="content-section" 
-    title="APLAWS" cache="true">
-
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Path)categoryPath)
-         .setModel(model);
-    </jsp:scriptlet>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-    <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu)
-         .setModel(model);
-    </jsp:scriptlet>
-    <define:component name="itemXML"
-      classname="com.arsdigita.cms.dispatcher.ContentPanel"/>
-    <define:component name="sectionXML"
-      classname="com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel"/>
-
-
-    <define:component name="relatedItems"
-      classname="com.arsdigita.london.navigation.ui.RelatedItems"/>
-
-    <define:component name="assignedTerms"
-      classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>
-  </define:page>
-
-  <show:all/>
-
-</jsp:root>
diff --git a/ccm-ldn-aplaws/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp b/ccm-ldn-aplaws/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
deleted file mode 100755
index c3b18a227..000000000
--- a/ccm-ldn-aplaws/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
+++ /dev/null
@@ -1,44 +0,0 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-          xmlns:define="/WEB-INF/bebop-define.tld" 
-          xmlns:show="/WEB-INF/bebop-show.tld"
-	  version="1.2">
-
-  <jsp:directive.page
-    import="com.arsdigita.london.navigation.NavigationModel,
-            com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
-
-  <jsp:declaration>
-    NavigationModel model = new CMSNavigationModel();
-  </jsp:declaration>
-
-  <define:page name="SiteProxyItemPage" application="content" 
-    title="CMS" cache="true">
-
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Path)categoryPath)
-         .setModel(model);
-    </jsp:scriptlet>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-    <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu)
-         .setModel(model);
-    </jsp:scriptlet>
-    <define:component name="itemXML"
-      classname="com.arsdigita.cms.dispatcher.ContentPanel"/>
-    <define:component name="siteProxyItemXML"
-      classname="com.arsdigita.cms.dispatcher.SiteProxyPanel"/>
-
-
-    <define:component name="relatedItems"
-      classname="com.arsdigita.london.navigation.ui.RelatedItems"/>
-
-    <define:component name="assignedTerms"
-      classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>
-  </define:page>
-
-  <show:all/>
-
-</jsp:root>
diff --git a/ccm-ldn-aplaws/src/ccm-ldn-aplaws.load b/ccm-ldn-aplaws/src/ccm-ldn-aplaws.load
index 970fe2d07..34ea2c55a 100755
--- a/ccm-ldn-aplaws/src/ccm-ldn-aplaws.load
+++ b/ccm-ldn-aplaws/src/ccm-ldn-aplaws.load
@@ -5,8 +5,8 @@
     <initializer class="com.arsdigita.core.Initializer"/>
     <table name="cms_items"/>
     <initializer class="com.arsdigita.cms.Initializer"/>
+    <initializer class="com.arsdigita.navigation.Initializer"/>
     <initializer class="com.arsdigita.portalworkspace.Initializer"/>
-    <initializer class="com.arsdigita.london.navigation.Initializer"/>
     <initializer class="com.arsdigita.london.search.Initializer"/>
     <initializer class="com.arsdigita.london.subsite.Initializer"/>
     <initializer class="com.arsdigita.london.terms.Initializer"/>
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
index 3f90b9bc5..fca7a7b9e 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AutoCategorisation.java
@@ -40,8 +40,8 @@ import com.arsdigita.domain.DomainServiceInterfaceExposer;
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.KernelExcursion;
 import com.arsdigita.london.cms.dublin.DublinCoreItem;
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.NavigationFileResolver;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.NavigationFileResolver;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.london.terms.Term;
 import com.arsdigita.london.util.Transaction;
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
index b1c5e53eb..bbb077160 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -37,9 +37,9 @@ import com.arsdigita.util.parameter.StringParameter;
 import com.arsdigita.util.parameter.URLParameter;
 import com.arsdigita.web.Application;
 
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.Template;
-import com.arsdigita.london.navigation.TemplateMapping;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.Template;
+import com.arsdigita.navigation.TemplateMapping;
 import com.arsdigita.london.terms.Domain;
 import com.arsdigita.london.terms.importer.Parser;
 // import com.arsdigita.portalworkspace.PageLayout;
@@ -55,7 +55,8 @@ import java.util.Set;
 import org.apache.log4j.Logger;
 
 /**
- * Loader.
+ * Loader executes nonrecurring at install time and loads (installs and
+ * initializes) the APLAWS integration module persistently into database.
  *
  * Creates category domains in the terms application according to 
  * configuration files and adds jsp templates to navigation.
@@ -204,14 +205,19 @@ public class Loader extends PackageLoader {
 
 
     public void run(final ScriptContext ctx) {
+        
+        /*                                                                   */
         Application.createApplication(Navigation.BASE_DATA_OBJECT_TYPE,
                                       "services",
                                       "Services",
                                       null);
 
+        /* Create an additional Navigation application instance used as an
+         * custom navigation tree in addition or as an alternative to the
+         * standard APLAWS LGL navigation tree.
+         */
         String customNavPath = (String)get(m_customNavPath);
         String customNavTitle = (String)get(m_customNavTitle);
-
         Application.createApplication(Navigation.BASE_DATA_OBJECT_TYPE,
                                       customNavPath,
                                       customNavTitle,
@@ -221,11 +227,13 @@ public class Loader extends PackageLoader {
             s_esdFilesLite : s_esdFiles;
 
         final Parser parser = new Parser();
+        // for each filename in the array of files containing categories
         for (int i = 0 ; i < files.length ; i++) {
             final String file = files[i];
             if (s_log.isInfoEnabled()) {
                 s_log.info("Process " + file);
             }
+            /* Import a Terms category domain.                                */
             parser.parse(Thread.currentThread().getContextClassLoader
                          ().getResourceAsStream
                          (file));
@@ -307,6 +315,17 @@ public class Loader extends PackageLoader {
             "/packages/navigation/templates/aplaws-portal.jsp");
     }
     
+    /**
+     * Determines the Terms domain using domainKey as well as the application
+     * instance using appURL and then creates a domain mapping using context
+     * as domain context.
+     * 
+     * Uses Package com.arsdigita.london.terms.Domain (!) 
+     * 
+     * @param domainKey
+     * @param appURL
+     * @param context 
+     */
     public void registerDomain(String domainKey,
                                String appURL,
                                String context) {
@@ -316,9 +335,14 @@ public class Loader extends PackageLoader {
                         " in context " + context);
         }
 
+        /* Determine Domain and Application objects, both MUST exist!         */
         Domain domain = Domain.retrieve(domainKey);  // package com.arsdigita.london.terms
         Application app = Application.retrieveApplicationForPath(appURL);
+        
+        /* Create domain mapping                                              */
         domain.setAsRootForObject(app, context);
+        
+        /* Create permissions and roles for content-center applications only  */
         if (app instanceof ContentSection) {
             RoleCollection coll = ((ContentSection) app).getStaffGroup().getOrderedRoles();
             Set adminRoles = new HashSet();
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java
index 38efa6beb..56e2985d2 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/AssignedIndexItemTerms.java
@@ -24,7 +24,7 @@ import com.arsdigita.cms.ContentBundle;
 import com.arsdigita.cms.ContentItem;
 import com.arsdigita.cms.ContentPage;
 import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.london.terms.ui.AbstractAssignedTerms;
 
 import org.apache.log4j.Logger;
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java
index 5aecfcebe..93e06af4a 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java
@@ -18,8 +18,8 @@
 
 package com.arsdigita.aplaws.ui;
 
-import com.arsdigita.london.navigation.Navigation;
-import com.arsdigita.london.navigation.NavigationModel;
+import com.arsdigita.navigation.Navigation;
+import com.arsdigita.navigation.NavigationModel;
 
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.persistence.DataCollection;
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java
index 4c8bf00ff..146e4c9e7 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java
@@ -22,7 +22,7 @@ import com.arsdigita.london.terms.Term;
 import com.arsdigita.london.terms.ui.AbstractTermDetails;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.navigation.Navigation;
 import com.arsdigita.categorization.Category;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.domain.DomainObjectFactory;
diff --git a/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws b/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws
index 2e7e76a88..030b48d29 100755
--- a/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws
+++ b/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws
@@ -222,11 +222,11 @@
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-navigation</param-value>
+      <param-value>/templates/ccm-navigation</param-value>
     </init-param>
     <init-param>
       <param-name>file-resolver</param-name>
-      <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
+      <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
     </init-param>
   </servlet>
 
@@ -365,7 +365,7 @@
 
   <servlet-mapping>
     <servlet-name>navigation-files</servlet-name>
-    <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
+    <url-pattern>/ccm-navigation/files/*</url-pattern>
   </servlet-mapping>
 
   <!-- module ccm-ldn-rss  -  servlet mappings   -->
diff --git a/ccm-ldn-aplaws/web/packages/content-section/templates/default/aplaws-item.jsp b/ccm-ldn-aplaws/web/packages/content-section/templates/default/aplaws-item.jsp
index 461737330..48234f432 100755
--- a/ccm-ldn-aplaws/web/packages/content-section/templates/default/aplaws-item.jsp
+++ b/ccm-ldn-aplaws/web/packages/content-section/templates/default/aplaws-item.jsp
@@ -4,8 +4,8 @@
 	  version="1.2">
 
   <jsp:directive.page
-    import="com.arsdigita.london.navigation.NavigationModel,
-            com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
+    import="com.arsdigita.navigation.NavigationModel,
+            com.arsdigita.navigation.cms.CMSNavigationModel"/>
 
   <jsp:declaration>
     NavigationModel model = new CMSNavigationModel();
@@ -15,22 +15,22 @@
     title="APLAWS" cache="true">
 
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Path)categoryPath)
+       ((com.arsdigita.navigation.ui.category.Path)categoryPath)
          .setModel(model);
     </jsp:scriptlet>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
     <jsp:scriptlet>
-       ((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu)
+       ((com.arsdigita.navigation.ui.category.Menu)categoryMenu)
          .setModel(model);
     </jsp:scriptlet>
     <define:component name="itemXML"
       classname="com.arsdigita.cms.dispatcher.ContentPanel"/>
 
     <define:component name="relatedItems"
-      classname="com.arsdigita.london.navigation.ui.RelatedItems"/>
+      classname="com.arsdigita.navigation.ui.RelatedItems"/>
 
     <define:component name="assignedTerms"
       classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>
diff --git a/ccm-ldn-aplaws/web/packages/navigation/templates/SpecializingList.jsp b/ccm-ldn-aplaws/web/packages/navigation/templates/SpecializingList.jsp
index 58d0d11ed..31fd0f20e 100644
--- a/ccm-ldn-aplaws/web/packages/navigation/templates/SpecializingList.jsp
+++ b/ccm-ldn-aplaws/web/packages/navigation/templates/SpecializingList.jsp
@@ -6,9 +6,9 @@
 
     <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
     <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-    <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+    <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+    <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
     <jsp:directive.page import="org.apache.log4j.Logger"/>
 
     <jsp:scriptlet>
@@ -23,24 +23,24 @@
     <define:page name="defaultItemPage" application="navigation"
                  title="Navigation" cache="false">
         <define:component name="greetingItem"
-                          classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+                          classname="com.arsdigita.navigation.ui.GreetingItem"/>
         <define:component name="categoryPath"
-                          classname="com.arsdigita.london.navigation.ui.category.Path"/>
+                          classname="com.arsdigita.navigation.ui.category.Path"/>
         <define:component name="categoryMenu"
-                          classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+                          classname="com.arsdigita.navigation.ui.category.Menu"/>
         <define:component name="itemList"
-                          classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/>
+                          classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
         <jsp:scriptlet>
-            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
-            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
-            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20);
-            ((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true);
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20);
+            ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true);
         </jsp:scriptlet>
 
         <define:component name="assignedTerms"
-                          classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
+                          classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
     </define:page>
     <show:all/>	
 </jsp:root>
\ No newline at end of file
diff --git a/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-legacy.jsp b/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-legacy.jsp
index 7e05a2e94..5c71db6f0 100755
--- a/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-legacy.jsp
+++ b/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-legacy.jsp
@@ -5,9 +5,9 @@
 
     <jsp:directive.page import="
 	com.arsdigita.cms.contenttypes.Article,
-	com.arsdigita.london.navigation.ui.CategoryItemNav,
-	com.arsdigita.london.navigation.ui.CategoryNav,
-	com.arsdigita.london.navigation.ui.ItemList"/>
+	com.arsdigita.navigation.ui.CategoryItemNav,
+	com.arsdigita.navigation.ui.CategoryNav,
+	com.arsdigita.navigation.ui.ItemList"/>
 <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
 
 <jsp:scriptlet>DispatcherHelper.cacheForWorld( response );</jsp:scriptlet>
@@ -16,25 +16,25 @@
   title="APLAWS" cache="true">
 
 <define:component name="categoryNav"
-    classname="com.arsdigita.london.navigation.ui.CategoryNav">
+    classname="com.arsdigita.navigation.ui.CategoryNav">
   <jsp:scriptlet> 
   ((CategoryNav) categoryNav).setUseItemID(false); 
   </jsp:scriptlet>
 </define:component>
 
 <define:component name="categoryItemNav"
-    classname="com.arsdigita.london.navigation.ui.CategoryItemNav">
+    classname="com.arsdigita.navigation.ui.CategoryItemNav">
   <jsp:scriptlet> 
   ((CategoryItemNav) categoryItemNav).setUseItemID(false); 
   </jsp:scriptlet>
 </define:component>
 
 <define:component name="greetingComponent"
-    classname="com.arsdigita.london.navigation.ui.GreetingItem">
+    classname="com.arsdigita.navigation.ui.GreetingItem">
 </define:component>
 
 <define:component name="fixedPromoComponent"
-    classname="com.arsdigita.london.navigation.ui.ItemList">
+    classname="com.arsdigita.navigation.ui.ItemList">
   <jsp:scriptlet>
   ItemList fixedPromo = (ItemList) fixedPromoComponent;
   fixedPromo.setObjectType( Article.BASE_DATA_OBJECT_TYPE );
@@ -47,7 +47,7 @@
 </define:component>
 
 <define:component name="dynamicPromoComponent"
-    classname="com.arsdigita.london.navigation.ui.ItemList">
+    classname="com.arsdigita.navigation.ui.ItemList">
   <jsp:scriptlet>
   ItemList dynamicPromo = (ItemList) dynamicPromoComponent;
   dynamicPromo.setObjectType( Article.BASE_DATA_OBJECT_TYPE );
@@ -61,11 +61,11 @@
 </define:component>
 
 <define:component name="L3ContentPane"
-    classname="com.arsdigita.london.navigation.ui.L3ContentPane">
+    classname="com.arsdigita.navigation.ui.L3ContentPane">
 </define:component>
 
 <define:component name="relatedItemsComponent"
-    classname="com.arsdigita.london.navigation.ui.RelatedItems">
+    classname="com.arsdigita.navigation.ui.RelatedItems">
 </define:component>
 
 </define:page>
diff --git a/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-portal.jsp b/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-portal.jsp
index 0616ab2ca..5c2222697 100755
--- a/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-portal.jsp
+++ b/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-portal.jsp
@@ -5,7 +5,7 @@
   version="1.2">
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
   <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
   <jsp:directive.page import="com.arsdigita.aplaws.ui.CategoryPortalSelectionModel"/>
 
@@ -22,13 +22,13 @@
     title="Navigation" cache="true">
 
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
     <define:component name="portalWorkspace"
-      classname="com.arsdigita.london.portal.ui.WorkspaceViewer"/>
+      classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.portal.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
+      ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
     </jsp:scriptlet>
   </define:page>
 
diff --git a/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-services.jsp b/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-services.jsp
index f2822f8db..253d93f84 100755
--- a/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-services.jsp
+++ b/ccm-ldn-aplaws/web/packages/navigation/templates/aplaws-services.jsp
@@ -6,9 +6,9 @@
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
   <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
+  <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
+  <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
 
   <jsp:scriptlet>
     long age = Navigation.getConfig().getIndexPageCacheLifetime();
@@ -23,25 +23,25 @@
     title="Navigation" cache="true">
 
     <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
+      classname="com.arsdigita.navigation.ui.GreetingItem"/>
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
     <define:component name="categoryTermDetails"
       classname="com.arsdigita.aplaws.ui.CategoryTermDetails"/>
     <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.AtoZObjectList"/>
+      classname="com.arsdigita.navigation.ui.object.AtoZObjectList"/>
     <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
 
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);      
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);      
       
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(30);
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
+      ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
     </jsp:scriptlet>
   </define:page>
 
diff --git a/ccm-ldn-aplaws/web/packages/navigation/templates/mparticle-index.jsp b/ccm-ldn-aplaws/web/packages/navigation/templates/mparticle-index.jsp
deleted file mode 100644
index 70e1e089a..000000000
--- a/ccm-ldn-aplaws/web/packages/navigation/templates/mparticle-index.jsp
+++ /dev/null
@@ -1,65 +0,0 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-       xmlns:define="/WEB-INF/bebop-define.tld" 
-         xmlns:show="/WEB-INF/bebop-show.tld"
-	    version="1.2">
-
-  <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
-  <jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
-
-  <jsp:scriptlet>
-    long age = Navigation.getConfig().getIndexPageCacheLifetime();
-    if (age == 0) {
-      DispatcherHelper.cacheDisable(response);
-    } else {
-      DispatcherHelper.cacheForWorld(response, (int)age);
-    }
-  </jsp:scriptlet>
-
-  <define:page name="defaultItemPage" application="navigation"
-    title="Navigation" cache="true">
-
-    <define:component name="greetingItem"
-      classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
-    <define:component name="sectionXML"
-      classname="com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel"/>
-    <jsp:scriptlet>
-        com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
-        ((com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel) sectionXML).setContentItem(item);
-    </jsp:scriptlet>
-    <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
-    <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
-    <define:component name="itemList"
-      classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
-    <jsp:scriptlet>
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
-
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
-      
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
-      ((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
-    </jsp:scriptlet>
-
-    <define:component name="assignedTerms"
-         classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
-
-  </define:page>
-  <show:all/>
-</jsp:root>
-
diff --git a/ccm-ldn-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp b/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/sitemap.jsp
similarity index 77%
rename from ccm-ldn-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp
rename to ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/sitemap.jsp
index cf59b9ce0..4151f1d10 100755
--- a/ccm-ldn-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp
+++ b/ccm-ldn-aplaws/web/templates/ccm-navigation/navigation/sitemap.jsp
@@ -13,9 +13,9 @@
     title="APLAWS" cache="true">
 
     <define:component name="categoryNav"
-      classname="com.arsdigita.london.navigation.ui.category.Hierarchy">
+      classname="com.arsdigita.navigation.ui.category.Hierarchy">
       <jsp:scriptlet>
-        ((com.arsdigita.london.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
+        ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
       </jsp:scriptlet>
     </define:component>
 
diff --git a/ccm-ldn-aplaws/web/templates/ccm-ldn-navigation/services/pid.jsp b/ccm-ldn-aplaws/web/templates/ccm-navigation/services/pid.jsp
similarity index 100%
rename from ccm-ldn-aplaws/web/templates/ccm-ldn-navigation/services/pid.jsp
rename to ccm-ldn-aplaws/web/templates/ccm-navigation/services/pid.jsp
diff --git a/ccm-ldn-aplaws/web/templates/ccm-ldn-navigation/services/summary.jsp b/ccm-ldn-aplaws/web/templates/ccm-navigation/services/summary.jsp
similarity index 82%
rename from ccm-ldn-aplaws/web/templates/ccm-ldn-navigation/services/summary.jsp
rename to ccm-ldn-aplaws/web/templates/ccm-navigation/services/summary.jsp
index 1c52b6861..7dbc4d913 100755
--- a/ccm-ldn-aplaws/web/templates/ccm-ldn-navigation/services/summary.jsp
+++ b/ccm-ldn-aplaws/web/templates/ccm-navigation/services/summary.jsp
@@ -13,9 +13,9 @@
     title="APLAWS" cache="true">
 
     <define:component name="categoryPath"
-      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+      classname="com.arsdigita.navigation.ui.category.Path"/>
     <define:component name="categoryMenu"
-      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
+      classname="com.arsdigita.navigation.ui.category.Menu"/>
     <define:component name="itemSummary"
       classname="com.arsdigita.aplaws.ui.TermItemSummary"/>
 
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-index.xsl
index 60a6818b6..55e315629 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-index.xsl
@@ -5,7 +5,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   xmlns:search="http://rhea.redhat.com/search/1.0"
   xmlns:atoz="http://xmlns.redhat.com/atoz/1.0"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz"
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/consultations-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/consultations-index.xsl
index ee1b586d7..18765c29c 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/consultations-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/consultations-index.xsl
@@ -5,7 +5,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   version="1.0">
 
 <!--
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/content-section-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/content-section-index.xsl
index 9797efa5a..012769826 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/content-section-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/content-section-index.xsl
@@ -5,7 +5,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav"
   version="1.0">
 
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-categories.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-categories.xsl
index c53df6013..0aed8951b 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-categories.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-categories.xsl
@@ -1,19 +1,13 @@
 <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:nav="http://ccm.redhat.com/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"/>	
 
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-index.xsl
index 2b44351a7..2d68c3fb9 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-index.xsl
@@ -1,1314 +1,1314 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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>
-
-
+<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/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-ldn-aplaws/web/themes/static/aplaws/forum-example/forum-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/forum-index.xsl
index ee421c73a..95e066f71 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/forum-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/forum-index.xsl
@@ -2,20 +2,13 @@
 <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:nav="http://ccm.redhat.com/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" />
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-index.xsl
index 9e0074492..c01df1899 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-index.xsl
@@ -1,1306 +1,1306 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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>
+<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/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-ldn-aplaws/web/themes/static/aplaws/lib/header.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/lib/header.xsl
index 65a6df7d4..48c37d16a 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/lib/header.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/lib/header.xsl
@@ -5,7 +5,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav"
   version="1.0">
 
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/lib/leftNav.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/lib/leftNav.xsl
index 14fb8bf89..40d397605 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/lib/leftNav.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/lib/leftNav.xsl
@@ -5,7 +5,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav"
   version="1.0">
 
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/lib/lib.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/lib/lib.xsl
index c50705c54..c6d314aa5 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/lib/lib.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/lib/lib.xsl
@@ -5,7 +5,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
 	xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
   exclude-result-prefixes="xsl bebop aplaws ui nav cms terms"
 	version="1.0">
@@ -293,7 +293,7 @@
 	       				<xsl:value-of select="nav:attribute[@name='launchDate']"/> - 
 	          			<!-- line above displays the locale specific version of the date - personally I think
 	          			     the default long version looks awful - maybe short format can be specified in 
-	          			     com.arsdigita.london.navigation.DataCollectionRenderer. Alternative approach
+	          			     com.arsdigita.navigation.DataCollectionRenderer. Alternative approach
                              is to construct short date with the available attributes eg UK version below 
                              (which could do with some left padding on day & month so that the dates align correctly)
                         <xsl:value-of select="nav:attribute[@name='launchDate']/@day"/>/
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/navigation-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/navigation-index.xsl
index 7ce59b280..7d660c7f7 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/navigation-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/navigation-index.xsl
@@ -4,7 +4,7 @@
                xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
                    xmlns:ui="http://www.arsdigita.com/ui/1.0"
                   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                  xmlns:nav="http://ccm.redhat.com/london/navigation"
+                  xmlns:nav="http://ccm.redhat.com/navigation"
     exclude-result-prefixes="xsl bebop aplaws ui cms nav"
                     version="1.0">
 
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/navigation-sitemap.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/navigation-sitemap.xsl
index c9ea11519..ccb45f5da 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/navigation-sitemap.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/navigation-sitemap.xsl
@@ -4,7 +4,7 @@
                 xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
                     xmlns:ui="http://www.arsdigita.com/ui/1.0"
                    xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                   xmlns:nav="http://ccm.redhat.com/london/navigation"
+                   xmlns:nav="http://ccm.redhat.com/navigation"
                 xmlns:search="http://rhea.redhat.com/search/1.0"
                   xmlns:atoz="http://xmlns.redhat.com/atoz/1.0"
      exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz"
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/portal-workspace-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/portal-workspace-index.xsl
index cbf12b36b..dc71550d2 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/portal-workspace-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/portal-workspace-index.xsl
@@ -5,7 +5,7 @@
              xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
                  xmlns:ui="http://www.arsdigita.com/ui/1.0"
                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                xmlns:nav="http://ccm.redhat.com/london/navigation"
+                xmlns:nav="http://ccm.redhat.com/navigation"
              xmlns:search="http://rhea.redhat.com/search/1.0"
              xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search portal"
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/search-admin.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/search-admin.xsl
index 1d143a00e..43e72b4c2 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/search-admin.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/search-admin.xsl
@@ -6,16 +6,11 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   xmlns:search="http://rhea.redhat.com/search/1.0"
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search"
 	version="1.0">
 
-  <!-- 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-ldn-aplaws/web/themes/static/aplaws/search-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/search-index.xsl
index ba76bc478..11e9e9d3d 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/search-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/search-index.xsl
@@ -6,22 +6,22 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   xmlns:ui="http://www.arsdigita.com/ui/1.0"
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:nav="http://ccm.redhat.com/london/navigation"
+  xmlns:nav="http://ccm.redhat.com/navigation"
   xmlns:search="http://rhea.redhat.com/search/1.0"
   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"/>
-
+
   <!-- 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"/>
+    <xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
   -->
-  <!-- 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:import href="../../../__ccm__/apps/content-section/xsl/index.xsl"/>
 
   <xsl:param name="context-prefix"/>
   <xsl:param name="dispatcher-prefix" />
@@ -80,17 +80,17 @@
 		<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 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 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 href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search
 			</a><span class="hide">|</span>
 		  </xsl:when>
 		  <xsl:otherwise />
@@ -101,7 +101,7 @@
 
     	</td>
       </tr>
-    </table>
+    </table>
 
     <xsl:call-template name="footer"/>
   </xsl:template>
@@ -125,7 +125,7 @@
     </p>
     </div>
   </xsl:template>
-
+
 
   <xsl:template name="searchNav">
     <div id="nav">
@@ -149,7 +149,8 @@
     </xsl:choose>
     <a href="/searchhelp" class="navChild" title="Hints and tips" >Hints and Tips</a><span class="hide">|</span>
     </div>
-  </xsl:template>

+  </xsl:template>
+
 
   <xsl:template name="searchMain">
     <xsl:choose>
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/types/MultiPartArticle.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/types/MultiPartArticle.xsl
index 742c2df6f..6c612f154 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/types/MultiPartArticle.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/types/MultiPartArticle.xsl
@@ -6,7 +6,7 @@
                 xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
                 xmlns:ui="http://www.arsdigita.com/ui/1.0"
-                xmlns:nav="http://ccm.redhat.com/london/navigation"
+                xmlns:nav="http://ccm.redhat.com/navigation"
                 exclude-result-prefixes="xsl bebop cms ui"
                 version="1.0">
   
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/types/SiteProxy.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/types/SiteProxy.xsl
index 2d4aa9b97..bbbb5c6ac 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/types/SiteProxy.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/types/SiteProxy.xsl
@@ -6,7 +6,7 @@
                 xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
                 xmlns:ui="http://www.arsdigita.com/ui/1.0"
-                xmlns:nav="http://ccm.redhat.com/london/navigation"
+                xmlns:nav="http://ccm.redhat.com/navigation"
                 exclude-result-prefixes="xsl bebop cms ui"
                 version="1.0">