diff --git a/ccm-auth-http/web/themes/heirloom/apps/auth-http/xsl/index.xsl b/ccm-auth-http/web/themes/heirloom/apps/auth-http/xsl/index.xsl
index 3bde5b7e6..dd3c6eec5 100755
--- a/ccm-auth-http/web/themes/heirloom/apps/auth-http/xsl/index.xsl
+++ b/ccm-auth-http/web/themes/heirloom/apps/auth-http/xsl/index.xsl
@@ -2,9 +2,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
                     
-  <!-- IMPORT DEFINITIONS ccm-auth-http installed as separate web application
-  <xsl:import href="../../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../../../ROOT/packages/ui/xsl/ui.xsl"/>
   -->
   <!-- IMPORT DEFINITIONS ccm-auth-http installed into the main CCM webapp
   -->
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl b/ccm-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl
index 230109cc2..4fba593f8 100644
--- a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl
+++ b/ccm-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl
@@ -9,9 +9,9 @@
 				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" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/packages/bebop/xsl/bebop.xsl" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/packages/ui/xsl/ui.xsl" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/packages/bebop/xsl/bebop.xsl" />
   -->
   <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
   -->
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css b/ccm-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css
index 74c5d3a59..c398a3e27 100644
--- a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css
+++ b/ccm-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css
@@ -1,7 +1,7 @@
 @import url("css/main.css");
 /* Chris presumably forgot the ! to comment the following 2 lines out
-/* <--@import url("/css/acs-master.css");-->   */
-/* <--@import url("/css/tabbed-pane/tabbed-pane.css");-->  */
+/* <--@import url("/themes/heirloom/css/acs-master.css");-->   */
+/* <--@import url("/themes/heirloom/css/tabbed-pane/tabbed-pane.css");-->  */
 
 
 body {
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.xsl b/ccm-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.xsl
index 8440f6225..6c28dd698 100644
--- a/ccm-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.xsl
+++ b/ccm-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.xsl
@@ -9,9 +9,9 @@
 				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" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/packages/bebop/xsl/bebop.xsl" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/packages/ui/xsl/ui.xsl" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/packages/bebop/xsl/bebop.xsl" />
 	-->
  	<!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
 	-->
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-index.css b/ccm-bundle/web/themes/static/aplaws-generic/forum-index.css
index 74c5d3a59..c398a3e27 100644
--- a/ccm-bundle/web/themes/static/aplaws-generic/forum-index.css
+++ b/ccm-bundle/web/themes/static/aplaws-generic/forum-index.css
@@ -1,7 +1,7 @@
 @import url("css/main.css");
 /* Chris presumably forgot the ! to comment the following 2 lines out
-/* <--@import url("/css/acs-master.css");-->   */
-/* <--@import url("/css/tabbed-pane/tabbed-pane.css");-->  */
+/* <--@import url("/themes/heirloom/css/acs-master.css");-->   */
+/* <--@import url("/themes/heirloom/css/tabbed-pane/tabbed-pane.css");-->  */
 
 
 body {
diff --git a/ccm-bundle/web/themes/static/aplaws-generic/forum-index.xsl b/ccm-bundle/web/themes/static/aplaws-generic/forum-index.xsl
index 666133a05..40150b681 100644
--- a/ccm-bundle/web/themes/static/aplaws-generic/forum-index.xsl
+++ b/ccm-bundle/web/themes/static/aplaws-generic/forum-index.xsl
@@ -9,9 +9,9 @@
 				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" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/packages/bebop/xsl/bebop.xsl" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/packages/ui/xsl/ui.xsl" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/packages/bebop/xsl/bebop.xsl" />
 	-->
  	<!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
 	-->
diff --git a/ccm-cms-assets-notes/application.xml b/ccm-cms-assets-notes/application.xml
index 01b4aeca9..5edacba6e 100755
--- a/ccm-cms-assets-notes/application.xml
+++ b/ccm-cms-assets-notes/application.xml
@@ -3,7 +3,7 @@
   name="ccm-cms-assets-notes"
   prettyName="Red Hat CMS Content Asset Notes"
   version="6.6.0"
-  release="1"
+  release="2"
   webapp="ROOT">
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
diff --git a/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/Note.java b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/Note.java
index 7671dde43..7537d497a 100755
--- a/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/Note.java
+++ b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/Note.java
@@ -39,16 +39,19 @@ import org.apache.log4j.Logger;
  * 
  */
 public class Note extends ACSObject {
-    public static final String BASE_DATA_OBJECT_TYPE =
-        "com.arsdigita.cms.contentassets.Note";
 
     private static final Logger s_log = Logger.getLogger( Note.class );
+    
+    /**  PDL stuff                                                            */
+    public static final String BASE_DATA_OBJECT_TYPE =
+                               "com.arsdigita.cms.contentassets.Note";
 
     static {
         s_log.debug("Static initalizer is starting...");
         DomainObjectFactory.registerInstantiator(
             BASE_DATA_OBJECT_TYPE,
             new DomainObjectInstantiator() {
+                @Override
                 public DomainObjectInstantiator resolveInstantiator
                     ( DataObject dataObject ) {
                         return this;
@@ -104,6 +107,7 @@ public class Note extends ACSObject {
 	 *  (non-Javadoc)
 	 * @see com.arsdigita.domain.DomainObject#initialize()
 	 */
+    @Override
 	protected void initialize() {
 		super.initialize();
 
@@ -192,17 +196,20 @@ public class Note extends ACSObject {
         return notes;
     }
 
+    @Override
     protected void beforeDelete() {
         // Put this note at the end so other notes will be correctly reordered
         setRank( Long.MAX_VALUE );
     }
 
+    @Override
     protected void beforeSave() {
         super.beforeSave();
 
         if( isNew() ) m_isNew = true;
     }
 
+    @Override
     protected void afterSave() {
         super.afterSave();
 
diff --git a/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesInitializer.java b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesInitializer.java
index 887bf73c2..5ae542b48 100755
--- a/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesInitializer.java
+++ b/ccm-cms-assets-notes/src/com/arsdigita/cms/contentassets/NotesInitializer.java
@@ -68,10 +68,11 @@ public class NotesInitializer extends ContentAssetInitializer {
     }
 
     // public void init( LegacyInitEvent ev ) {
+    @Override
     public void init( DomainInitEvent ev ) {
         super.init( ev );
 
-        ContentType.registerXSLFile( null, "/__ccm__/assets/notes/index.xsl" );
+        ContentType.registerXSLFile( null, "/themes/heirloom/assets/notes/xsl/index.xsl" );
         DomainObjectTraversal.registerAdapter( Note.BASE_DATA_OBJECT_TYPE,
                                                new SimpleDomainObjectTraversalAdapter(),
                                                SimpleXMLGenerator.ADAPTER_CONTEXT );
diff --git a/ccm-cms-assets-notes/web/__ccm__/assets/notes/index.xsl b/ccm-cms-assets-notes/web/themes/heirloom/assets/notes/xsl/index.xsl
old mode 100755
new mode 100644
similarity index 74%
rename from ccm-cms-assets-notes/web/__ccm__/assets/notes/index.xsl
rename to ccm-cms-assets-notes/web/themes/heirloom/assets/notes/xsl/index.xsl
index b317120fd..461a70e1f
--- a/ccm-cms-assets-notes/web/__ccm__/assets/notes/index.xsl
+++ b/ccm-cms-assets-notes/web/themes/heirloom/assets/notes/xsl/index.xsl
@@ -3,11 +3,11 @@
 <!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
 ]>
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  version="1.0">
+<xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
+                   version="1.0">
 
-  <xsl:param name="static-prefix"/>
+  <xsl:param name="internal-theme"/>
 
   <xsl:template match="cms:notesDisplay">
     <xsl:for-each select="object">
@@ -32,11 +32,11 @@
 
   <xsl:template name="notes-action-icon">
     <xsl:choose>
-      <xsl:when test="@action='delete'"><xsl:value-of select="$static-prefix"/>/cms/admin/action-group/action-delete.png</xsl:when>
+      <xsl:when test="@action='delete'"><xsl:value-of select="$internal-theme"/>/images/action-delete.png</xsl:when>
 
-      <xsl:when test="@action='edit'"><xsl:value-of select="$static-prefix"/>/cms/admin/action-group/action-edit.png</xsl:when>
+      <xsl:when test="@action='edit'"><xsl:value-of select="$internal-theme"/>/images/action-edit.png</xsl:when>
 
-      <xsl:otherwise><xsl:value-of select="$static-prefix"/>/cms/admin/action-group/action-generic.png</xsl:otherwise>
+      <xsl:otherwise><xsl:value-of select="$internal-theme"/>/images/action-generic.png</xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
diff --git a/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java b/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java
index 17948a27f..5215e1420 100755
--- a/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java
+++ b/ccm-cms-types-article/src/com/arsdigita/cms/contenttypes/ArticleInitializer.java
@@ -24,7 +24,8 @@ import org.apache.log4j.Logger;
  * Initializes the GenericArticle content type.
  * Defines the content type specific properties and just uses the super class
  * methods to register the content type with the (transient) content type store
- * (map).
+ * (map). This is done by runtimeRuntime startup method which runs the init()
+ * methods of all initializers (this one just using the parent implementation).
  *
  * @author Justin Ross &lt;jross@redhat.com&gt;
  * @version $Id: ArticleInitializer.java 757 2005-09-02 14:12:21Z sskracic $
@@ -37,9 +38,9 @@ public class ArticleInitializer extends ContentTypeInitializer {
         super("ccm-cms-types-article.pdl.mf", GenericArticle.BASE_DATA_OBJECT_TYPE);
     }
 
-//  deprecated, no longer used.
-//  public String[] getStylesheets() {
-//      return new String[]
-//          { "/static/content-types/com/arsdigita/cms/contenttypes/Article.xsl" };
-//  }
+    @Override
+    public String[] getStylesheets() {
+        return new String[]
+            { "/static/content-types/com/arsdigita/cms/contenttypes/Article.xsl" };
+    }
 }
diff --git a/ccm-core/src/com/arsdigita/bebop/page/PageTransformer.java b/ccm-core/src/com/arsdigita/bebop/page/PageTransformer.java
index 2df03a961..c9f0938c6 100755
--- a/ccm-core/src/com/arsdigita/bebop/page/PageTransformer.java
+++ b/ccm-core/src/com/arsdigita/bebop/page/PageTransformer.java
@@ -16,6 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
+
 package com.arsdigita.bebop.page;
 
 import com.arsdigita.developersupport.DeveloperSupport;
diff --git a/ccm-core/src/com/arsdigita/loader/CoreLoader.java b/ccm-core/src/com/arsdigita/loader/CoreLoader.java
index e108d7ee2..5a5faeff7 100755
--- a/ccm-core/src/com/arsdigita/loader/CoreLoader.java
+++ b/ccm-core/src/com/arsdigita/loader/CoreLoader.java
@@ -455,8 +455,6 @@ public class CoreLoader extends PackageLoader {
         packType.setDispatcherClass("com.arsdigita.webdevsupport.Dispatcher");
     }
 
-//     private static final String XSL_ROOT = "/packages/acs-admin/xsl/";
-
     private Application loadAdminApp() {
         ApplicationType adminType = ApplicationType
             .createApplicationType("admin",
diff --git a/ccm-core/src/com/arsdigita/versioning/VersioningServlet.java b/ccm-core/src/com/arsdigita/versioning/VersioningServlet.java
index 2ebf6eafb..004ca706f 100755
--- a/ccm-core/src/com/arsdigita/versioning/VersioningServlet.java
+++ b/ccm-core/src/com/arsdigita/versioning/VersioningServlet.java
@@ -61,7 +61,7 @@ public final class VersioningServlet extends BaseServlet {
     private final static String CMD   = "cmd";
     private final static String OID   = "oid";
     private final static String TITLE = "title";
-    private final static String JSP_DIR = "/packages/versioning/";
+    private final static String JSP_DIR = "themes/heirloom//packages/versioning/";
 
     public void doService(HttpServletRequest req, HttpServletResponse resp) 
         throws ServletException, IOException {
diff --git a/ccm-core/web/css/acs-master.css b/ccm-core/web/css/acs-master.css
deleted file mode 100755
index 6c8ea49de..000000000
--- a/ccm-core/web/css/acs-master.css
+++ /dev/null
@@ -1,271 +0,0 @@
-@import url(context-bar/context-bar.css);
-@import url(tabbed-pane/tabbed-pane.css);
-
-body {
-  background: white;
-  color: black;
-}
-.main   {background-color: #ffffff;}
-.dark   {background-color: #6699cc;}
-.medium {background-color: #99ccff;}
-.light  {background-color: #ccffff;}
-td.bread_crumbs { 
-  padding-left: 8px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-  font-family: arial, helvetica;
-  font-size: x-small; 
-}
-td.top_right_links { 
-  padding-right: 8px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-  font-family: arial, helvetica;
-  font-size: x-small; 
-}
-td.bottom_right_links { 
-  padding-right: 8px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-  font-family: arial, helvetica;
-  font-size: x-small; 
-}
-td.page_title { 
-  padding-left: 8px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-  font-weight: bold;
-  font-family: arial, helvetica;
-  color: #333333;
-  font-size: medium; 
-}
-
-a.tab_unselected { 
-  text-decoration: none;
-  font-weight: bold;
-  color: black;
-  font-family: arial, helvetica;
-  font-size: x-small; 
-}
-a.tab_unselected:hover { 
-  text-decoration: underline; 
-}
-a.tab_selected { 
-  text-decoration: none;
-  font-weight: bold;
-  color: white;
-  font-family: arial, helvetica;
-  font-size: x-small;  
-}
-a.tab_selected:hover { 
-  text-decoration: underline; 
-}
-td.tab_selected { 
-  text-decoration: none; 
-  font-weight: bold;
-   color: white;
-   font-family: arial, helvetica;
-   font-size: x-small;
-   background-color: #878175;
-}
-tr.tab_selected { 
-  text-decoration: none; 
-  font-weight: bold; 
-  color: white; 
-  font-family: arial, helvetica; 
-  font-size: x-small; 
-  background-color: #878175; 
-}
-
-a.action_link { 
-  font-family: tahoma, arial, helvetica; 
-  font-size: x-small; 
-  color: #333333;
-  text-decoration: none; 
-}
-a.action_link:hover { 
-  font-family: tahoma, arial, helvetica; 
-  font-size: x-small; 
-  color: #333333;
-  text-decoration: underline; 
-}
-a.action_link_disabled { 
-  font-family: tahoma, arial, helvetica; 
-  font-size: x-small; 
-  color: #999999;
-  text-decoration: none; 
-}
-a.form_label {
-  font-family: tahoma, arial, helvetica;
-  font-size: x-small;
-  font-weight: bold;
-}
-
-td.form_label {
-  font-family: tahoma, arial, helvetica;
-  font-size: x-small;
-  font-weight: bold;
-}
-td.form_value {
-  font-family: tahoma, arial, helvetica;
-  font-size: x-small;
-}
-
-/**********Split Pane*********/
-th.split_pane_header { 
-  font-family: arial, helvetica; 
-  text-align: left; 
-  padding-left: 8px; 
-  font-size: x-small; 
-  background-color: rgb(63,63,63); 
-  color: rgb(222,222,222); 
-}
-td.split_pane_left_background { 
-  background-color: rgb(222,222,222); 
-}
-td.split_pane_left_item { 
-  font-family: tahoma, arial, helvetica; 
-  font-size: x-small; 
-  font-weight: bold; 
-  padding-left: 8px;
-}
-a.split_pane_left_item { 
-  font-family: tahoma, arial, helvetica; 
-  font-size: x-small; 
-  font-weight: bold; 
-  text-decoration: none; 
-}
-a.split_pane_left_item:hover { 
-  font-family: tahoma, arial, helvetica; 
-  font-size: x-small; 
-  font-weight: bold; 
-  text-decoration: underline; 
-}
-td.split_pane_left_item_selected { 
-  font-family: tahoma, arial, helvetica; 
-  font-size: x-small; 
-  font-weight: bold; 
-  background-color: #eae9c6;
-  padding-left: 8px; 
-}
-td.split_pane_right_body { 
-  padding-left: 8px; 
-  font-family: arial, helvetica; 
-  font-size: x-small; 
-}
-
-/*****Misc. Table********/
-th.table_header {
-  font-family: tahoma, arial, helvetica;
-  font-size: x-small;
-  font-weight: bold;
-  color: black;
-}
-a.table_header {
-  font-family: tahoma, arial, helvetica;
-  font-size: x-small;
-  font-weight: bold;
-  text-decoration: none;
-  color: black;
-}
-a.table_header:hover {
-  font-family: tahoma, arial, helvetica;
-  font-size: x-small;
-  font-weight: bold;
-  text-decoration: underline;
-  color: black;
-}
-tr.table_row_odd {
-  font-family: tahoma, arial, helvetica;
-  font-size: x-small;
-  font-weight: bold;
-  background-color: #e1d5b0;
-}
-tr.table_row_even {
-  font-family: tahoma, arial, helvetica;
-  font-size: x-small;
-  font-weight: bold;
-  background-color: white;
-}
-td.table_cell {
-  font-family: tahoma, arial, helvetica;
-  font-size: x-small;
-}
-p {
-  font-family: georgia, arial, helvetica;
-  font-size: x-small;
-}
-
-th.section_header {
-  font-family: arial, helvetica;
-  text-align: left;
-  padding-left: 8px;
-  font-size: x-small;
-  background-color: #878175;
-  color: white;
-}
-td.section_header {
-  font-family: arial, helvetica;
-  font-size: x-small;
-  background-color: #878175;
-  color: white;
-}
-td.section_body {
-  padding-left: 8px;
-  font-family: arial, helvetica;
-  font-size: x-small;
-}
-h3.section_body {
-  font-family: arial, helvetica;
-  font-size: small;
-  font-weight: bold;
-  margin-bottom: 4px;
-}
-h4.section_body {
-  font-family: arial, helvetica;
-  font-size: x-small;
-  font-weight: bold;
-  margin-bottom: 4px;
-  margin-top: 4px;
-}
-blockquote.section_body {
-  margin-bottom: 0px;
-  margin-top: 0px;
-  margin-left: 16px;
-  font-family: arial, helvetica;
-  font-size: x-small;
-}
-p.section_body  {
-  font-family: arial, helvetica;
-  font-size: x-small;
-}
-
-td.left_tabs_background {
-  background-color: #DDD7A1;
-}
-td.left_tabs_tab {
-  font-family: tahoma, arial, helvetica;
-  font-size: x-small;
-  font-weight: bold;
-  padding-left: 8px;
-}
-a.left_tabs_tab {
-  font-family: tahoma, arial, helvetica;
-  font-size: x-small;
-  font-weight: bold;
-  text-decoration: none;
-}
-a.left_tabs_tab:hover {
-  font-family: tahoma, arial, helvetica;
-  font-size: x-small;
-  font-weight: bold;
-  text-decoration: underline;
-}
-td.left_tabs_tab_selected {
-  font-family: tahoma, arial, helvetica;
-  font-size: x-small;
-  font-weight: bold;
-  background-color: #eae9c6;
-  padding-left: 8px;
-}
-
diff --git a/ccm-core/web/css/context-bar/RHCLogoRoundRedSmallest.png b/ccm-core/web/css/context-bar/RHCLogoRoundRedSmallest.png
deleted file mode 100755
index 43979025f..000000000
Binary files a/ccm-core/web/css/context-bar/RHCLogoRoundRedSmallest.png and /dev/null differ
diff --git a/ccm-core/web/css/context-bar/context-bar.css b/ccm-core/web/css/context-bar/context-bar.css
deleted file mode 100755
index e09c2d6da..000000000
--- a/ccm-core/web/css/context-bar/context-bar.css
+++ /dev/null
@@ -1,82 +0,0 @@
-body, a, div, td, th {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: small;
-}
-
-/***Admin Styles****/
-table.globalAdminHeader {
-  background-color: rgb(225,225,225);
-  font-size: 10pt;
-  width: 100%;
-}
-
-table.globalAdminHeader td {
-  padding: 6px;
-  padding-bottom: 7px;
-  vertical-align: middle;
-}
-
-td.globalAdminNavigation {
-  color: rgb(63,63,63);
-}
-
-table.globalAdminHeader td.globalLogo {
-  width: 25px;
-  height: 25px;
-  background-image: url(RHCLogoRoundRedSmallest.png);
-  background-repeat: no-repeat;
-}
-
-td.globalAdminNavigation a {
-  color: rgb(63,63,63);
-}
-
-td.globalAdminNavigation span.contextBarSeparator {
-  color: rgb(63,63,63);
-  font-weight: bold;
-}
-
-td.globalAdminControl {
-  color: rgb(63,63,63);
-  margin: 0;
-  padding: 0;
-  padding-right: 6px;
-  text-align: right;
-  vertical-align: middle;
-  font-weight: bold;
-}
-
-td.globalAdminControl a,
-td.globalAdminControl img {
-  margin: 0;
-  padding: 0;
-  color: rgb(63,63,63);
-  vertical-align: middle;
-  border: 0 none;
-  text-decoration: none;
-}
-
-td.global-links {
-  float: right;
-}
-
-td.global-link-icon {
-  padding: 0 4px 0 10px;
-}
-
-td.global-link-icon img {
-  border: 0;
-}
-
-td.global-link a {
-  color: blue;
-  text-decoration: none;
-}
-
-div.page-title {
-  font-size: larger;
-  font-weight: bold;
-  margin: 0;
-  padding: 4px 6px 4px 6px;
-}
-
diff --git a/ccm-core/web/css/error.css b/ccm-core/web/css/error.css
deleted file mode 100755
index 7a2ec08bf..000000000
--- a/ccm-core/web/css/error.css
+++ /dev/null
@@ -1,570 +0,0 @@
-/*
- * Fundamental Styles
- */
-
-body {
-  background-color: white;
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 10pt;
-  margin: 0;
-}
-
-table {
-  border-spacing: 0;
-  empty-cells: show;
-}
-
-td {
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 10pt;
-  vertical-align: top;
-}
-
-.main   { /* background-color: #ffffff; */ }
-.dark   { /* background-color: #666666; */ }
-.medium { /* background-color: #999999; */ }
-.light  { /* background-color: #cccccc; */ }
-
-.activeTabColor {
-  background: #93bee2;
-}
-
-.inactiveTabColor {
-  background: #d8e8f5;
-}
-
-.dialogTitle {
-  font-weight: bold;
-  font-size: 12pt;
-}
-
-.messageOfTheDay {
-  padding-left: 0.4em;
-  padding-right: 0.4em;
-  margin-top: 0.4em;
-  margin-bottom: 0.4em;
-  border-style: solid;
-  border-bottom-width: 1px;
-  border-top-width: 1px;
-  border-right-width: 1px;
-  border-left-width: 1px;
-  border-color: #cccccc;
-}
-
-/* We would use a div here, but it triggers a rendering bug. */
-
-table.setInside {
-  width: 100%;
-  border-spacing: 0;
-}
-
-table.setInside td.setInside {
-  padding: 6px;
-  padding-bottom: 0;
-}
-
-/* 
- * Global Header
- *
- * This is currently a blue stripe at the top of each workspace and
- * application page.  The left side, a context bar, uses the class
- * attribute "globalNavigation" and the right uses "globalControl".
- */
-
-table.globalHeader {
-  background-color: #003366;
-  font-size: 10pt;
-  width: 100%;
-}
-
-table.globalHeader td {
-  padding: 6px;
-  padding-bottom: 7px;
-  vertical-align: middle;
-}
-
-td.globalNavigation {
-  color: #d8e8f5;
-}
-
-td.globalNavigation a {
-  color: #d8e8f5;
-}
-
-td.globalNavigation span.contextBarSeparator {
-  color: #d8e8f5;
-  font-weight: bold;
-}
-
-td.globalNavigation span.immediateContext {
-  color: white;
-  font-weight: bold;
-}
-
-form.globalSearch {
-  margin: 0;
-  border: 0;
-  padding: 0;
-}
-
-td.globalControl {
-  color: white;
-  margin: 0;
-  padding: 0;
-  padding-right: 6px;
-  text-align: right;
-  vertical-align: middle;
-  font-weight: bold;
-}
-
-td.globalControl a, 
-td.globalControl img {
-  margin: 0;
-  padding: 0;
-  color: white;
-  vertical-align: middle;
-  border: 0 none;
-  text-decoration: none;
-}
-
-/*
- * Local Header
- *
- * The header elements right under the blue stripe.  These are
- * elements logically connected to the current application, not to the
- * system in general.
- */
-
-table.localHeader {
-  width: 100%;
-}
-
-table.localHeader td.localTitle {
-  text-align: left;
-  font-weight: bold;
-  font-size: 12pt;
-}
-
-table.localHeader td.localControl,
-table.localHeader td.localControl a {
-  text-align: right;
-}
-
-/* 
- * Split Panel 
- */
-
-table.splitPanel {
-  width: 100%;
-}
-
-table.splitPanelHeader {
-  /* Nothing here yet. */
-}
-
-td.splitPanelLeft {
-  width: 25%;
-}
-
-td.splitPanelRight {
-  width: 75%;
-}
-
-/* 
- * Tabs and Header/Body/Footer Separators
- */
-
-table.topRuleNoTabs {
-  background-color: #93bee2;
-  width: 100%;
-  margin: 0;
-  margin-bottom: 6px;
-  border-top: 1px solid black;
-  padding: 0;
-}
-
-table.topRuleUnderTabs {
-  background-color: #93bee2;
-  width: 100%;
-  margin: 0;
-  margin-bottom: 6px;
-  padding: 0;
-}
-
-table.bottomRule {
-  background-color: #93bee2;
-  width: 100%;
-  margin: 0;
-  margin-top: 6px;
-  border-bottom: 1px solid black;
-  padding: 0;
-}
-
-table.tabs {
-  margin: 0;
-  border-spacing: 0;
-}
-
-table.tabs a {
-  color: black;
-  text-decoration: none;
-  white-space: nowrap;
-}
-                                   
-table.tabs td {
-  margin: 0;
-  border: 0;
-  padding: 0;
-  font-weight: bold;
-  font-size: 10pt;
-  color: black;
-  text-decoration: none;
-  white-space: nowrap;
-}
-
-table.tabs td.activeTab {
-  vertical-align: middle;
-  background-color: #93bee2;
-  border-top: 1px solid black;
-  padding-top: 1px;
-}
-
-table.tabs td.inactiveTab {
-  vertical-align: middle;
-  background-color: #d8e8f5;
-  border-top: 1px solid black;
-  border-bottom: 1px solid black;
-  padding-top: 2px;
-}
-
-table.tabs td.trimSpace {
-  border-bottom: 1px solid black;
-}
-
-/*
- * Portals and Portlets
- * 
- * "NW" denotes Narrow and Wide columns, in that order.  Other layouts
- * will require other CSS rules.
- */
-
-table.portalLayoutNW {
-  width: 100%;
-  margin: 0;
-  padding: 0;
-}
-
-table.portalLayoutNW td.narrowColumn {
-  width: 25%;
-}
-
-table.portalLayoutNW td.columnSeparator {
-  border: 0;
-  padding: 0;
-}
-
-table.portalLayoutNW td.wideColumn {
-  width: 75%;
-}
-
-table.portalLayoutW {
-  width: 100%;
-  margin: 0;
-  padding: 0;
-}
-
-table.portalLayoutW td.VeryWideColumn {
-  width:100%;
-}
-
-table.portalLayoutWN {
-  width: 100%;
-  margin: 0;
-  padding: 0;
-}
-
-table.portalLayoutWN td.narrowColumn {
-  width: 25%;
-}
-
-table.portalLayoutWN td.columnSeparator {
-  border: 0;
-  padding: 0;
-}
-
-table.portalLayoutWN td.wideColumn {
-  width: 75%;
-}
-
-table.portalLayoutNWN {
-  width: 100%;
-  margin: 0;
-  padding: 0;
-}
-
-table.portalLayoutNWN td.narrowColumnLeft {
-  width: 25%;
-}
-
-table.portalLayoutNWN td.narrowColumnRight {
-  width: 25%;
-}
-
-table.portalLayoutNWN td.columnSeparator {
-  border: 0;
-  padding: 0;
-}
-
-table.portalLayoutNWN td.wideColumn {
-  width: 50%;
-}
-
-table.portalLayoutNNN {
-  width: 100%;
-  margin: 0;
-  padding: 0;
-}
-
-table.portalLayoutNNN td.narrowColumnLeft {
-  width: 33%;
-}
-
-table.portalLayoutNNN td.narrowColumnRight {
-  width: 33%;
-}
-
-table.portalLayoutNNN td.columnSeparator {
-  border: 0;
-  padding: 0;
-}
-
-table.portalLayoutNNN td.narrowColumnCenter {
-  width: 33%;
-}
-
-table.portlet {
-  width: 100%;
-  margin: 0;
-  margin-bottom: 6px;
-  padding: 0;
-}
-
-table.portlet td.portletHeader {
-  font-weight: bold;
-  background: #dddddd;
-  color: #666666;
-  padding: 4px;
-  padding-left: 6px;  
-  vertical-align: middle;
-}
-
-table.portlet td.portletIcon {
-  background: #dddddd;
-  padding: 4px;
-  text-align: right;
-}
-
-table.portlet td.portletBody {
-  padding: 6px;
-}
-
-/* 
- * Fancy Tables (for tabular data)
- */
-
-table.fancy {
-  width: 100%;
-  border-collapse: collapse;
-  border-spacing: 0;
-  border: 1px solid black;
-}
-
-table.fancy th {
-  padding: 4px;
-  border:0 none;
-  font-size: 9pt;
-  text-align: left;
-}
-
-table.fancy td {
-  padding: 4;
-  border: 0 none;
-  font-size: 9pt;
-}
-
-table.fancy thead tr {
-  background-color: #eeeeee;
-}
-
-table.fancy thead tr.subheading {
-  background-color: #93bee2;
-}
-
-table.fancy thead tr.subheading td {
-  text-align: right;
-}
-
-table.fancy tbody td.subDivider {
-  padding: 0;
-  background-color: #93bee2;
-}
-
-table.fancy thead th {
-  font-weight: bold;
-  text-align: left;
-  white-space: nowrap;
-}
-
-table.fancy thead th.numeric {
-  text-align: right;
-}
-
-table.fancy thead th.date {
-  text-align: center;
-}
-
-table.fancy thead th.icon {
-  text-align: center;
-}
-
-table.fancy tbody td {
-  border-top: 1px solid black;
-}
-
-table.fancy tbody td.noborder {
-  border-top: none;
-}
-
-table.fancy tbody td.numeric {
-  text-align: right;
-}
-
-table.fancy tbody td.date {
-  text-align: right;
-  white-space: nowrap;
-}
-
-table.fancy tbody td.icon {
-  text-align: center;
-}
-
-/*
- *  With is for tables that want to look standard (no lines on the inside) but
- *  also want to have the really thin line around the outside
- */
-table.plainWithBorder {
-  width: 100%;
-  border-collapse: collapse;
-  border-spacing: 0;
-  border: 1px solid black;
-}
-
-
-/*
- * Miscellaneous
- */
-
-select {
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 9pt;
-}
-
-tr.rowEven  { background-color: #eeeeff; }
-
-th {
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 10pt;
-  font-weight: bold;
-  text-align: left;
-  vertical-align: bottom;
-}
-
-td.panelHeader {
-  padding-left: 0.4em;
-  padding-right: 0.4em;
-  padding-top: 0.1em;
-  padding-bottom: 0.1em;
-  vertical-align: middle;
-  text-align: left;
-  font-weight: bold;  
-}
-
-/* styles for section headers */
-
-table.sectionHeader {
-  border:0 none;
-}
-
-table.sectionHeader td {
-  font-weight:bold;
-  font-size:12pt;
-  border:0 none;
-  white-space:nowrap;
-}
-
-table.sectionHeader td.add {
-  text-align:right;
-}
-
-table.sectionHeader td.path {
-  text-align:right;
-  font-family:monospace;
-  font-weight:normal;
-  font-size:10pt;
-}
-
-/* styles for controlBar */
-
-table.controlBar {
-  width:100%;
-  font-size:8pt;
-  border:0 none;
-  border-collapse:collapse;
-  border-spacing:0;
-  border:1px solid black;
-}
-
-table.controlBar td {
-  font-size:8pt;
-  border:0 none;
-  white-space:nowrap;
-}
-
-table.controlBar span {
-  font-size:8pt;
-  font-weight:bold;
-  border:0 none;
-  white-space:nowrap;
-}
-
-table.controlBar select {
-  font-size:8pt;
-  vertical-align: middle;
-}
-
-table.controlBar input {
-  font-size:8pt;
-  vertical-align: middle;
-}
-
-table.controlBar img {
-  vertical-align: middle;
-}
-
-tbody.controlBar td {
-  border-top:1px solid black;
-}
-
-tbody.controlBar td.numeric {
-  text-align:right;
-  padding-right:20px;
-}
-
-tbody.controlBar td.date {
-  text-align:right;
-  white-space:nowrap;
-}
-
-tbody.controlBar td.icon {
-  text-align:center;
-}
diff --git a/ccm-core/web/css/tabbed-pane/tab-bar.png b/ccm-core/web/css/tabbed-pane/tab-bar.png
deleted file mode 100755
index 9c5ea5a1e..000000000
Binary files a/ccm-core/web/css/tabbed-pane/tab-bar.png and /dev/null differ
diff --git a/ccm-core/web/css/tabbed-pane/tab-selected-end.png b/ccm-core/web/css/tabbed-pane/tab-selected-end.png
deleted file mode 100755
index e7890a8c2..000000000
Binary files a/ccm-core/web/css/tabbed-pane/tab-selected-end.png and /dev/null differ
diff --git a/ccm-core/web/css/tabbed-pane/tab-selected.png b/ccm-core/web/css/tabbed-pane/tab-selected.png
deleted file mode 100755
index 19ebe5fec..000000000
Binary files a/ccm-core/web/css/tabbed-pane/tab-selected.png and /dev/null differ
diff --git a/ccm-core/web/css/tabbed-pane/tab-unselected-end.png b/ccm-core/web/css/tabbed-pane/tab-unselected-end.png
deleted file mode 100755
index de7b61aa6..000000000
Binary files a/ccm-core/web/css/tabbed-pane/tab-unselected-end.png and /dev/null differ
diff --git a/ccm-core/web/css/tabbed-pane/tab-unselected.png b/ccm-core/web/css/tabbed-pane/tab-unselected.png
deleted file mode 100755
index e6a6b9f4b..000000000
Binary files a/ccm-core/web/css/tabbed-pane/tab-unselected.png and /dev/null differ
diff --git a/ccm-core/web/css/tabbed-pane/tabbed-pane.css b/ccm-core/web/css/tabbed-pane/tabbed-pane.css
deleted file mode 100755
index a95b3ef32..000000000
--- a/ccm-core/web/css/tabbed-pane/tabbed-pane.css
+++ /dev/null
@@ -1,56 +0,0 @@
-div.tabbed-pane div, div.tabbed-pane table.tab-set, div.tabbed-pane table.tab-set td {
-  margin: 0;
-  border: 0;
-  padding: 0;
-}
-
-div.tabbed-pane table {
-  border-collapse: collapse;
-}
-
-div.tabbed-pane table.tab-set {
-  margin-left: 6px;
-}
-
-div.tabbed-pane table.tab-set a {
-  text-decoration: none;
-  color: rgb(63,63,63);
-}
-
-div.tabbed-pane table.tab-set td.tab-label {
-  margin-left: 4px;
-  padding: 5px 0 3px 10px;
-  font-size: x-small;
-  background: rgb(225,225,225) url(tab-unselected.png) no-repeat;
-}
-
-div.tabbed-pane table.tab-set td.tab-end {
-  width: 10px;
-  background: url(tab-unselected-end.png) no-repeat;
-}
-
-div.tabbed-pane table.tab-set td.current-tab-label {
-  margin-left: 4px;
-  padding: 5px 0 3px 10px;
-  background: rgb(162,30,30) url(tab-selected.png) no-repeat;
-  color: white;
-}
-
-div.tabbed-pane table.tab-set td.current-tab-end {
-  width: 10px;
-  background: url(tab-selected-end.png) no-repeat;
-}
-
-div.tabbed-pane table.tab-set td.tab-spacer {
-  width: 4px;
-}
-
-div.tabbed-pane table.rule {
-  width: 100%;
-  background: rgb(162,30,30) url(tab-bar.png) repeat-x;
-  height: 10px;
-}
-
-div.tabbed-pane div.current-pane {
-  width: 100%;
-}
diff --git a/ccm-core/web/packages/acs-admin/xsl/admin.xsl b/ccm-core/web/packages/acs-admin/xsl/admin.xsl
deleted file mode 100755
index 50e4e612a..000000000
--- a/ccm-core/web/packages/acs-admin/xsl/admin.xsl
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:admin="http://www.arsdigita.com/admin-ui/1.0"
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                exclude-result-prefixes="admin">
-
-<xsl:import href="../../bebop/xsl/bebop.xsl"/>
-<xsl:import href="../../bebop/xsl/DimensionalNavbar.xsl"/>
-<xsl:import href="../../bebop/xsl/TabbedPane.xsl"/>
-<xsl:import href="../../bebop/xsl/DataTable.xsl"/>
-<xsl:import href="../../ui/xsl/ui.xsl"/>
-<xsl:import href="split-panel.xsl"/>
-
-
-<!-- ContextBar formatting -->
-<xsl:template match="bebop:boxPanel[@class='ContextBar']">
-  <xsl:apply-imports/>
-  <hr />
-</xsl:template>
-
-<!-- Table with alternate color for each column. -->
- <xsl:template match="bebop:table[@class='AlternateTable']"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <table>
-     <xsl:for-each select="@*">
-       <xsl:attribute name="{name()}">
-         <xsl:value-of select="."/>
-       </xsl:attribute>
-     </xsl:for-each>
-     <xsl:apply-templates select="bebop:thead"/>
-     <xsl:for-each select="bebop:tbody">
-         <xsl:call-template name="AlternateTableBody"/>
-     </xsl:for-each>
-   </table>
- </xsl:template>
-
- <xsl:template name="AlternateTableBody"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <tbody>
-     <xsl:for-each select="bebop:trow">
-       <tr>
-         <xsl:attribute name="bgcolor">
-            <xsl:choose>
-               <xsl:when test="position() mod 2">#e1d5b0</xsl:when>
-               <xsl:otherwise>#ffffff</xsl:otherwise>
-            </xsl:choose>
-         </xsl:attribute>
-         <xsl:for-each select="bebop:cell">
-           <td>
-             <xsl:for-each select="@align|@valign|@colspan|@width">
-               <xsl:attribute name="{local-name()}">
-                <xsl:value-of select="."/>
-               </xsl:attribute>
-             </xsl:for-each>
-             <xsl:apply-templates/>
-           </td>
-         </xsl:for-each>
-       </tr>
-     </xsl:for-each>
-   </tbody>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/acs-admin/xsl/admin_en.xsl b/ccm-core/web/packages/acs-admin/xsl/admin_en.xsl
deleted file mode 100755
index 4c4557ab9..000000000
--- a/ccm-core/web/packages/acs-admin/xsl/admin_en.xsl
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:admin="http://www.arsdigita.com/admin-ui/1.0"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  exclude-result-prefixes="admin">
-
-<xsl:import href="admin.xsl"/>
- 
-  <!-- this rule matches one user -->
-  <xsl:template match="admin:userInfo">
-    
-    <!-- Feature #166221 capitalize form labels -->
-    <ul>
-      <li> Name: <xsl:value-of select="@name"/> </li>
-      <li> Email: 
-	<table>
-	  <xsl:apply-templates select="admin:email" />
-	</table>
-      </li>
-      <li> Screen Name:  <xsl:value-of select="@screenName"/> </li>
-      <li> URL: <a href="{@URI}"><xsl:value-of select="@URI"/> </a> </li>
-      <li> User ID:  <xsl:value-of select="@id"/> </li>
-      <li> Member State: <xsl:value-of select="@memberState"/> 
-      </li>
-    </ul>
-    
-  </xsl:template>
-  
-  <!-- used to format the list of actions available for one user -->
-  <xsl:template match="admin:userActions">
-    
-    <h3>Adminstrative Actions</h3>
-    
-    <ul>
-      <li><a href="password-update?user_id={@id}">Update password</a></li>
-      <li><a href="login?user_id={@id}">Become this user</a></li>
-    </ul>
-    
-  </xsl:template>
-  
-  <!-- used to format the header of the password update page -->
-  <xsl:template match="bebop:label[@class='UserPasswordHeader']">
-    For <xsl:value-of select="text()"/>
-    <hr />
-  </xsl:template>
-  
-  <!-- usage note displayed on the password-update page -->
-  <xsl:template match="admin:PasswordNote">
-    <h4>Note</h4>
-    <p>If this user does not currently have an authentication record,
-      one will be created when you submit this form and the account
-      will be enabled for login to the system.</p>
-  </xsl:template>
-
-  <!-- used to format primary email for display -->
-  <xsl:template match="admin:email[@primary='t']">
-    <tr>
-      <td>
-        <a href="mailto:{@address}"><xsl:value-of select="@address"/></a>
-      </td>
-      <td>
-        (primary)
-      </td>
-    </tr>
-  </xsl:template>
-  
-  <!-- used to format non-primary email for display -->
-  <xsl:template match="admin:email">
-    <tr>
-      <td>
-        <a href="mailto:{@address}"><xsl:value-of select="@address"/></a>
-      </td>
-      <td>
-      </td>
-    </tr>
-  </xsl:template>
-
-
-<!-- Access Denied Page -->
-<xsl:template match="bebop:label[@class='AccessDenied']">
-  <hr />
-  <p>You don't have permission to perform the requested action.</p>
-  <hr />
-</xsl:template>
-
-<!-- Display search error message -->
-<xsl:template match="bebop:list[@class='SearchResultList'][count(bebop:cell)=0]">
-   <p><font color="red">Your search returned no results.</font></p>
-</xsl:template>
-
-<!-- Display search error message -->
-<xsl:template match="bebop:list[@class='SearchResultList'][count(bebop:cell)>0]">
-    <p>Results matching your query:</p>
-    <ul>
-      <xsl:for-each select="bebop:cell">
-        <li><xsl:apply-templates/></li>
-      </xsl:for-each>
-    </ul>
-</xsl:template>
-
-<!-- used to format the basic information and actions available for one group -->
-<xsl:template match="admin:groupInfo">
-
-<ul>
-  <li> Group Name: <xsl:value-of select="@name"/> </li>
-  <li> Primary Email: <xsl:value-of select="@email"/> </li>
-</ul>
-
-</xsl:template>
-
-<xsl:template match="bebop:list[@class='UserGroupsResultList'][count(bebop:cell)=0]">
-   <p><font color="red">None</font></p>
-</xsl:template>
-  
-<xsl:template match="bebop:link[@class='deleteLink']">
-  <xsl:text>&#160;</xsl:text>
-  (<a href="{@href}" onclick="{@onclick}" class="action_link">
-    <xsl:apply-templates/>
-  </a>)
-</xsl:template>
-
-</xsl:stylesheet>
-
-
diff --git a/ccm-core/web/packages/acs-admin/xsl/sitemap_en.xsl b/ccm-core/web/packages/acs-admin/xsl/sitemap_en.xsl
deleted file mode 100755
index c72b2b5d6..000000000
--- a/ccm-core/web/packages/acs-admin/xsl/sitemap_en.xsl
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:admin="http://www.arsdigita.com/admin-ui/1.0"
-                exclude-result-prefixes="admin">
-
-<xsl:import href="admin.xsl"/>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/acs-admin/xsl/split-panel.xsl b/ccm-core/web/packages/acs-admin/xsl/split-panel.xsl
deleted file mode 100755
index aa5dc3fe2..000000000
--- a/ccm-core/web/packages/acs-admin/xsl/split-panel.xsl
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                   version="1.0">
- 
- <xsl:param name="internal-theme"/>
- 
-
-<!-- Sidebar Nav Panel -->
-<xsl:template match="*[@class='sidebarNavPanel']">
-  <xsl:call-template name="sidebarNavPanel">
-    <xsl:with-param name="heading" select="//*[@class='heading']"/>
-    <xsl:with-param name="navbar" select="//*[@class='navbar']"/>
-    <xsl:with-param name="main" select="//*[@class='main']"/>
-    <xsl:with-param name="navbar-title" select="@navbar-title"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- sidebarNavPanel: This is the outer framing for spli-panels.
-     The heading param is actually the heading for the first section on 
-     the right side -->
-<xsl:template name="sidebarNavPanel">
-  <xsl:param name="heading">The Heading Goes Here</xsl:param>
-  <xsl:param name="navbar">This is the Navbar</xsl:param>
-  <xsl:param name="main">This is the Main Display Panel</xsl:param>
-  <xsl:param name="navbar-title">Title</xsl:param>
-  
-  <table border="0" cellpadding="0" cellspacing="0" width="100%">
-    <tr>
-      <td class="split_pane_left_background" valign="top" width="20%">
-        <!-- Left Panel -->
-
-        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-          <tr>
-            <td>
-              <table border="0" cellpadding="2" cellspacing="0" width="100%">
-                <tr>
-                  <th class="split_pane_header">
-                    <xsl:value-of select="$navbar-title"/>
-                  </th>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr>
-            <td bgcolor="#ffffff">
-              <table border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                  <td height="1"/>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              <!-- Left Panel: Navigation, list of objects -->
-              <xsl:apply-templates select="$navbar"/>
-            </td>
-          </tr>
-        </table>
-      </td>
-      <td width="1"/>
-      <td valign="top">
-        <!-- Right Panel: Where the contents go -->
-        <xsl:apply-templates select="$main"/>
-      </td>
-    </tr>
-  </table>
-</xsl:template>
-
-
-<!-- Split-panel: This wraps the navigation in the left panel -->
-<xsl:template match="bebop:boxPanel[@class='navbar']">
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr>
-<td>
- <table border="0" cellpadding="1" cellspacing="0" width="100%">
-   <tr>
-     <td height="8">
-       <table border="0" cellpadding="0" cellspacing="0">
-	 <tr>
-	   <td height="8"/>
-	 </tr>
-       </table>
-     </td>
-   </tr>
-   <xsl:apply-templates select=".//bebop:list[@class='sidebarNavList']"/>
-   <xsl:apply-templates select=".//bebop:tree"/>
-   <tr>
-     <td height="8">
-       <table border="0" cellpadding="0" cellspacing="0">
-	 <tr>
-	   <td height="8"/>
-	 </tr>
-       </table>
-     </td>
-   </tr>
-   <xsl:for-each select="bebop:cell/bebop:link">
-     <tr>
-       <td class="split_pane_left_item">
-	 <xsl:apply-templates select="."/>
-       </td>
-     </tr>
-   </xsl:for-each>
- </table>
-</td>
-</tr>
-</table>
-</xsl:template>
-
-
-
-<!-- Split-panel: The list of objects in the left navigational panel -->
-<xsl:template match="bebop:list[@class='sidebarNavList']">
-  <xsl:for-each select="bebop:cell"> 
-    <xsl:choose>
-      <xsl:when test="@selected='selected'">  
-      <tr>
-        <td class="split_pane_left_item_selected" nowrap="1">
-          <xsl:apply-templates/><xsl:text>&#160;</xsl:text><img border="0" height="9" width="5">
-            <xsl:attribute name="src">
-              <xsl:value-of select="//@assets"/>{$internal-theme}/images/arrow-right.gif</xsl:attribute>
-            </img>
-          </td>
-        </tr>
-      </xsl:when>
-      <xsl:otherwise>
-        <tr>
-          <td class="split_pane_left_item" nowrap="1">
-            <xsl:apply-templates/>
-          </td>
-        </tr>
-      </xsl:otherwise>
-    </xsl:choose>
-    <tr>
-      <td>
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td height="4"/>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </xsl:for-each>
-</xsl:template>
-
-
-<!-- Split-panel: The individual objects in the left navigational panel -->
-<xsl:template match="bebop:list[@class='sidebarNavList']/bebop:cell/bebop:link">
-<a class="split_pane_left_item" href="{@href}">
-<xsl:apply-templates/>
-</a>
-</xsl:template>
-
-
-
-<!-- Format the nav bar when the contents is a tree -->
-<xsl:template match="bebop:boxPanel[@class='navbar']//bebop:tree">
-<xsl:for-each select="bebop:t_node">
-<xsl:call-template name="write-node">
-<xsl:with-param name="node" select="."/>
-</xsl:call-template>
-</xsl:for-each>
-</xsl:template>
-
-<!-- pads the label of the submit buttons -->
-<xsl:template match="bebop:formWidget[@type='submit']">
-  <input value="&#160;&#160;&#160;{@value}&#160;&#160;&#160;">
-    <xsl:if test="boolean(@onclick) = false()">
-      <xsl:attribute name="onclick">
-        <xsl:value-of select="'dcp_hide(this);'"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:for-each select="@*[name() != 'value']">
-      <xsl:attribute name="{name()}">
-        <xsl:value-of select="."/>
-      </xsl:attribute>
-    </xsl:for-each>
-  </input>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/bebop-jsp/www/all-in-one.jsp b/ccm-core/web/packages/bebop-jsp/www/all-in-one.jsp
deleted file mode 100755
index fcdd0ece8..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/all-in-one.jsp
+++ /dev/null
@@ -1,40 +0,0 @@
-<%@ taglib prefix="define" uri="/WEB-INF/bebop-define.tld" %>
-<%@ taglib prefix="show" uri="/WEB-INF/bebop-show.tld" %>
-<%@ page import="com.arsdigita.bebop.*" %>
-<%@ page import="com.arsdigita.bebop.form.*" %>
-<%@ page import="com.arsdigita.bebop.event.*" %>
-
-<%--
-all-in-one demo.  
-shows definition of page and display (show:...) tags in same page
---%>
-
-<define:page name="p" title="Test Page">
-<% 
-Form myForm = new Form("myForm");
-myForm.addProcessListener(new FormProcessListener() {
-    public void process(FormSectionEvent fse) { 
-       System.err.println("form process");
-    }
-});
-myForm.add(new TextField("foo"));
-myForm.add(new Submit("bar"));
-p.add(myForm);
-%>
-</define:page>
-
-<show:page>
-this is a test. Let's see if we can insert the form here:
-
-  <show:form name="myForm">
-  <ul>
-    <li>input widget: <show:component name="foo" />
-    <li>submit: <show:component name="bar" />
-  </ul>
-  </show:form>
-
-  <p> the advantage of not trying to parse this as XML is that we can
-  have badly-formed HTML here: 
-    <ul> <li> one <li> two <li> three </ul>
-
-</show:page>
\ No newline at end of file
diff --git a/ccm-core/web/packages/bebop-jsp/www/globalization.jsp b/ccm-core/web/packages/bebop-jsp/www/globalization.jsp
deleted file mode 100755
index cb4733d72..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/globalization.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ taglib prefix="i18n" uri="/WEB-INF/i18n.tld" %>
-<%@ page import="com.arsdigita.dispatcher.DispatcherHelper" %>
-
-This is a demonstration of the Jakarta i18n taglib.
-<p>
-First we need to establish the bundle/locale with the bundle tag.
-
-<i18n:bundle baseName="com.arsdigita.ui.login.SubsiteResources"
-             locale="<%= DispatcherHelper.getRequestContext(request).getLocale() %>"
-             id="subsite"/>
-
-<p>This is a message from the login package: 
-
-<font color="red">
-<i18n:message key="login.userNewForm.passwordBlurb"/>
-</font>
-
-<p>This is what happens when you ask for a message that isn't there:
-<font color="red">
-<i18n:message key="login.userNewForm.asdkfjljkzxcv">
-Default message text
-</i18n:message>
-</font>
-
-
-
-
-
diff --git a/ccm-core/web/packages/bebop-jsp/www/included.jsp b/ccm-core/web/packages/bebop-jsp/www/included.jsp
deleted file mode 100755
index f07ff8611..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/included.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-Included page:
-
-  <show:form name="exampleForm">
-  <ul>
-    <li>first name field: <show:component name="textField" />
-    <li>last name field: <show:component name="submitWidget" />
-  </ul>
-  </show:form>
\ No newline at end of file
diff --git a/ccm-core/web/packages/bebop-jsp/www/index.jsp b/ccm-core/web/packages/bebop-jsp/www/index.jsp
deleted file mode 100755
index 7b680b856..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/index.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-Examples of Bebop-JSP-XSLT integration:
-
-<ul>
-<li><a href="test.jsp">Basic test with page defined in JSP</a>
-<li><a href="test-class.jsp">Basic test with page defined in class</a>
-<li><a href="all-in-one.jsp">Basic test with page defined and showed in same JSP</a>
-<li><a href="test-master.jsp">master test (master page defines new components)</a>
-<li><a href="test-master-static.jsp">"master" page with static includes (all components defined in slave page)</a>
-<li><a href="test-include.jsp">include test</a>
-<li><a href="tab-test.jsp">defining a tabbed pane</a>
-<li><a href="list.jsp">displaying a model-backed List</a>
-<li><a href="table.jsp">displaying a model-backed Table</a>
-<li><a href="options.jsp">defining a form with option groups 
-    (radio buttons, etc.)</a>
-<li><a href="globalization.jsp">showing a page with message-catalog lookups
-</ul>
-
-
diff --git a/ccm-core/web/packages/bebop-jsp/www/list.jsp b/ccm-core/web/packages/bebop-jsp/www/list.jsp
deleted file mode 100755
index f242cfc63..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/list.jsp
+++ /dev/null
@@ -1,58 +0,0 @@
-<%@ taglib prefix="define" uri="/WEB-INF/bebop-define.tld" %>
-<%@ taglib prefix="show" uri="/WEB-INF/bebop-show.tld" %>
-<%@ page import="com.arsdigita.bebop.PageState" %>
-<%@ page import="com.arsdigita.bebop.List" %>
-<%@ page import="com.arsdigita.bebop.list.ListModelBuilder" %>
-<%@ page import="com.arsdigita.bebop.list.ListModel" %>
-<%@ page import="com.arsdigita.bebop.form.*" %>
-<%@ page import="com.arsdigita.bebop.event.*" %>
-
-<define:page name="p" title="foo">
-  <define:list name="myList">
-    <% 
-     myList.setModelBuilder(new ListModelBuilder() { 
-        private Object[] m_values = new Object[] {"foo", "bar", "baz"};
-        private boolean m_locked;
-        
-        public ListModel makeModel(List list, PageState state) {
-            return new ListModel() {
-                private int i = -1;
-                
-                public boolean next() { 
-                    i += 1;
-                    return ( i < m_values.length );
-                }
-                
-                public Object getElement() { 
-                    return m_values[i]; 
-                }
-
-                public String getKey() { 
-                    return String.valueOf(i); 
-                }
-            };
-        }
-
-        public void lock() {
-            m_locked = true;
-        }
-
-        public final boolean isLocked() {
-            return m_locked;
-        }
-    });
-  %>
-  </define:list>
-</define:page>
-
-<show:page>
-showing page with list.
-
-<p>
-<% int i = 0; %>
-<ul>
-<show:list name="myList">
-   <li>list item #<%= ++i %>: <show:listItem/>.  next...
-</show:list>
-
-</show:page>
diff --git a/ccm-core/web/packages/bebop-jsp/www/master-page-def.jsp b/ccm-core/web/packages/bebop-jsp/www/master-page-def.jsp
deleted file mode 100755
index e75e377fb..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/master-page-def.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ taglib prefix="define" uri="/WEB-INF/bebop-define.tld" %>
-<%@ page import="com.arsdigita.bebop.*" %>
-<%@ page import="com.arsdigita.bebop.form.*" %>
-<%@ page import="com.arsdigita.bebop.event.*" %>
-
-<define:page name="masterPage" title="Test Page">
-<% 
-Form f = new Form("preSlaveForm");
-f.add(new TextField("pre1"));
-f.add(new Submit("presubmit"));
-f.addSubmissionListener(new FormSubmissionListener() { 
-   public void submitted(FormSectionEvent fse) { 
-      System.out.println("Processed preSlaveForm");
-   }
-});
-masterPage.add(f);
-%>
-</define:page>
\ No newline at end of file
diff --git a/ccm-core/web/packages/bebop-jsp/www/master-page.jsp b/ccm-core/web/packages/bebop-jsp/www/master-page.jsp
deleted file mode 100755
index cd5c2d787..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/master-page.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%@ taglib prefix="show" uri="/WEB-INF/bebop-show.tld" %>
-
-<%@ include file="master-page-def.jsp" %>
-
-<show:page>
-<font color="red">This is a master page.  
-
-<br>
-
-preslave form, defined in master-page-def.jsp:
-
-</font>
-
-  <show:form name="preSlaveForm">
-      form label for input (pre1): <show:component name="pre1" />
-    <show:component name="presubmit" />
-  </show:form>
-
-  <hr>
-
-  <show:slave/>
- 
-  <hr>
-
-  <font color="red">slave done</font>
-
-note that you can also show components from the slave page inside 
-the master page.  Just refer to them by name.
-
-</show:page>
diff --git a/ccm-core/web/packages/bebop-jsp/www/options.jsp b/ccm-core/web/packages/bebop-jsp/www/options.jsp
deleted file mode 100755
index e05d206d6..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/options.jsp
+++ /dev/null
@@ -1,57 +0,0 @@
-<%@ taglib prefix="define" uri="/WEB-INF/bebop-define.tld" %>
-<%@ taglib prefix="show" uri="/WEB-INF/bebop-show.tld" %>
-<%@ page import="com.arsdigita.bebop.*" %>
-<%@ page import="com.arsdigita.bebop.form.*" %>
-<%@ page import="com.arsdigita.bebop.event.*" %>
-
-<define:page name="p" title="foo">
- <define:form name="myForm">
-   <define:radioGroup name="radio">
-    <define:option name="foo" value="fooValue"/>
-    <define:option name="bar" value="barValue"/>
-    <define:option name="baz" value="bazValue"/>
-   </define:radioGroup>
-   <define:checkboxGroup name="cb">
-    <define:option name="foo" value="fooValue"/>
-    <define:option name="bar" value="barValue"/>
-    <define:option name="baz" value="bazValue"/>
-   </define:checkboxGroup>
-
-   <define:select name="select">
-    <define:option name="foo" value="fooValue"/>
-    <define:option name="bar" value="barValue"/>
-    <define:option name="baz" value="bazValue"/>
-   </define:select>
-
-   <define:multipleSelect name="multi">
-    <define:option name="foo" value="fooValue"/>
-    <define:option name="bar" value="barValue"/>
-    <define:option name="baz" value="bazValue"/>
-   </define:multipleSelect>
- </define:form>
-</define:page>
-
-<show:page>
-showing page with option groups.
-
-<show:form name="myForm">
-
-<p>
-radio group:
-<show:component name="radio"/>
-
-<p>
-checkbox group:
-<show:component name="cb"/>
-
-<p>
-single select:
-<show:component name="select"/>
-
-<p>
-multi select:
-<show:component name="multi"/>
-
-</show:form>
-
-</show:page>
diff --git a/ccm-core/web/packages/bebop-jsp/www/redirect-race-1.jsp b/ccm-core/web/packages/bebop-jsp/www/redirect-race-1.jsp
deleted file mode 100755
index 10ea52610..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/redirect-race-1.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ page import="com.arsdigita.persistence.SessionManager, java.sql.*" %>
-<%@ page import="com.arsdigita.dispatcher.*" %>
-
-<%
-response.addHeader("Expires", "-1");
-response.addHeader("Cache-control", "no-cache");
-Connection conn = SessionManager.getSession().getConnection();
-PreparedStatement stmt = 
-    conn.prepareStatement("insert into redirect_race_test (singleton, when) " 
-    + "values (?, sysdate)");
-stmt.setObject(1, new Integer(request.getParameter("random")));
-stmt.executeUpdate();
-
-DispatcherHelper.sendRedirect(request, response, "redirect-race-2.jsp");
-
-// delay before committing transaction
-%>
-
diff --git a/ccm-core/web/packages/bebop-jsp/www/redirect-race-2.jsp b/ccm-core/web/packages/bebop-jsp/www/redirect-race-2.jsp
deleted file mode 100755
index 17f2a92d0..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/redirect-race-2.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page import="com.arsdigita.persistence.SessionManager, java.sql.*" %>
-<!--
-for whatever reason, there is no way for me to tell for
-sure whether this page is being cached or not.
-one way to discourage caching is to beef up the file
-size.
--->
-<%
-response.addHeader("Cache-control", "no-cache");
-response.addHeader("Expires", "-1");
-Connection conn = SessionManager.getSession().getConnection();
-Statement stmt = conn.createStatement();
-ResultSet rs = stmt.executeQuery("select * from redirect_race_test "
-    + " where when = (select max(when) from redirect_race_test)");
-rs.next();
-%>
-<%= rs.getString("singleton") %>
diff --git a/ccm-core/web/packages/bebop-jsp/www/static-footer.jsp b/ccm-core/web/packages/bebop-jsp/www/static-footer.jsp
deleted file mode 100755
index 820095a0d..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/static-footer.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-  <hr>
-
-  <font color="red">slave done</font>
-
-note that you could still show components from the slave page inside 
-the master page, even though you can't define new components here.
\ No newline at end of file
diff --git a/ccm-core/web/packages/bebop-jsp/www/static-header.jsp b/ccm-core/web/packages/bebop-jsp/www/static-header.jsp
deleted file mode 100755
index 559ed9568..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/static-header.jsp
+++ /dev/null
@@ -1,12 +0,0 @@
-<font color="red">This is a master page, included via static 
-&lt;%@ include file=...> tags.
-
-<br>
-
-We couldn't easily define new components in the master page, because
-we are inside a show:... page block for a concrete Page object that
-has already been locked and finished.
-
-</font>
-
-<hr>
diff --git a/ccm-core/web/packages/bebop-jsp/www/tab-test.jsp b/ccm-core/web/packages/bebop-jsp/www/tab-test.jsp
deleted file mode 100755
index 577dd51bc..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/tab-test.jsp
+++ /dev/null
@@ -1,41 +0,0 @@
-<%@ taglib prefix="define" uri="/WEB-INF/bebop-define.tld" %>
-<%@ taglib prefix="show" uri="/WEB-INF/bebop-show.tld" %>
-<%@ page import="com.arsdigita.bebop.*" %>
-<%@ page import="com.arsdigita.bebop.form.*" %>
-<%@ page import="com.arsdigita.bebop.event.*" %>
-<%@ page import="com.arsdigita.sitenode.SiteNodePresentationManager" %>
-<%@ page import="com.arsdigita.xml.Document" %>
-<%@ page import="com.arsdigita.dispatcher.DispatcherHelper" %>
-
-<% request = DispatcherHelper.restoreRequestWrapper(request); %>
-
-<define:page name="p" title="tab pane test">
-  <define:tabbedPane name="tabbedPane">
-    <define:tab name="leftForm" label="Left Form">
-      <define:form name="left">
-         <% left.add(new Label("left")); %>
-      </define:form>
-    </define:tab>
-    <define:tab name="right" label="Right Form">
-      <define:form name="right">
-        <% right.setEncType("multipart/form-data");
-    right.setMethod("POST");
-    right.add(new FileUpload("upfile"));
-    right.add(new Submit("send"));
-    right.addProcessListener(new FormProcessListener() { 
-        public void process(FormSectionEvent fse) { 
-            System.out.println("Got uploaded file");
-        }
-    });
-        %>
-     </define:form>
-   </define:tab>
- </define:tabbedPane>
-</define:page>
-
-<show:page>
-  <show:component name="tabbedPane"/>
-</show:page>
-
-
-
diff --git a/ccm-core/web/packages/bebop-jsp/www/table.jsp b/ccm-core/web/packages/bebop-jsp/www/table.jsp
deleted file mode 100755
index 5cba378fa..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/table.jsp
+++ /dev/null
@@ -1,59 +0,0 @@
-<%@ taglib prefix="define" uri="/WEB-INF/bebop-define.tld" %>
-<%@ taglib prefix="show" uri="/WEB-INF/bebop-show.tld" %>
-<%@ page import="com.arsdigita.bebop.*" %>
-<%@ page import="com.arsdigita.bebop.form.*" %>
-<%@ page import="com.arsdigita.bebop.event.*" %>
-
-<define:page name="p" title="foo">
-<% 
-  Object tableValues[][] = new Object[][] {
-       {"Bill Schneider", "bschneid@arsdigita.com", "developer"},
-       {"Doug Harris", "dharris@arsdigita.com", "developer"},
-       {"Roger Metcalf", "rmetcalf@arsdigita.com", "developer"},
-       {"Rich James", "rjames@arsdigita.com", "sales/marketing"},
-       {"Harry Greenspun", "harryg@arsdigita.com", "VP sales"}
-    };
-  Object tableHeaders[] = new Object[] { 
-        "Name", "Email", "title"
-    };
-
-  Table t = new Table(tableValues, tableHeaders);
-  t.setIdAttr("myTable");
-  p.add(t);
-%>
-</define:page>
-
-<show:page> This is a demonstration of using JSP to style the contents
-of a model-backed Table.  The &lt;show:table>, &lt;show:thead>,
-&lt;show:tbody>, and &lt;show:row> tags iterate over the rows and
-columns of data from the model and the &lt;show:col/> places the
-component for an individual table column.  
-
-<p>If the Table contains a cell renderer, the &lt;show:col/> contents
-will be globally styled according to the rules for whatever component
-is there.  
-
-<p>Note that any HTML &lt;tr> and &lt;td> tags must be manually
-placed.  But this is a good thing because then a regular JSP/HTML
-editor can modify table colors, spacing, etc.
-
-&lt;show:col>,
-
-<table cellspacing="4">
-<show:table name="myTable">
- <tr bgcolor="#99ccff">
-  <show:thead>
-   <th><show:col/></th>
-  </show:thead>
- </tr>
-  <show:tbody>
-   <tr bgcolor="#99ffcc">
-      <show:row>
-        <td><show:col/></td>
-      </show:row>
-   </tr>
-  </show:tbody>
-</show:table>
-</table>
-
-</show:page>
\ No newline at end of file
diff --git a/ccm-core/web/packages/bebop-jsp/www/test-class.jsp b/ccm-core/web/packages/bebop-jsp/www/test-class.jsp
deleted file mode 100755
index 38e9321ff..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/test-class.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ taglib prefix="show" uri="/WEB-INF/bebop-show.tld" %>
-
-<%-- basic JSP integration test, taking page definition from class  --%>
-<show:page pageClass="com.arsdigita.bebop.jsp.ExamplePage">
-
-Showing a page from a class.
-
-  <show:form name="exampleForm">
-  <ul>
-    <li>first name field: <show:component name="textField" />
-    <li>last name field: <show:component name="submitWidget" />
-  </ul>
-  </show:form>
-
-</show:page>
\ No newline at end of file
diff --git a/ccm-core/web/packages/bebop-jsp/www/test-def.jsp b/ccm-core/web/packages/bebop-jsp/www/test-def.jsp
deleted file mode 100755
index 1fe0cefb0..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/test-def.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%@ taglib prefix="define" uri="/WEB-INF/bebop-define.tld" %>
-<%@ page import="com.arsdigita.bebop.*" %>
-<%@ page import="com.arsdigita.bebop.parameters.*" %>
-<%@ page import="com.arsdigita.bebop.form.*" %>
-<%@ page import="com.arsdigita.bebop.event.*" %>
-
-<define:page name="p" title="Test Page">
-<% 
-Form myForm = new Form("myForm");
-final ServletRequest req = request;
-myForm.addProcessListener(new FormProcessListener() {
-    public void process(FormSectionEvent fse) { 
-       req.setAttribute("test-def.submitted", 
-             fse.getFormData().getString("foo"));
-    }
-});
-final StringParameter spFoo = new StringParameter("foo");
-myForm.add(new TextField(spFoo));
-myForm.add(new Submit("bar"));
-p.add(myForm);
-%>
-</define:page>
diff --git a/ccm-core/web/packages/bebop-jsp/www/test-include.jsp b/ccm-core/web/packages/bebop-jsp/www/test-include.jsp
deleted file mode 100755
index 7f7d4b76f..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/test-include.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%@ taglib prefix="show" uri="/WEB-INF/bebop-show.tld" %>
-
-<show:page pageClass="com.arsdigita.bebop.jsp.ExamplePage">
-This page is going to include another page.
-<br>
-include another page:
-
-<hr>
-
-  <%-- use static @include file=... to get around brokenness in JSP 
-    1.1 spec. --%>
-  <%@ include file="included.jsp" %>
-
-<hr>
-
-include done.
-
-</show:page>
-
diff --git a/ccm-core/web/packages/bebop-jsp/www/test-master-def.jsp b/ccm-core/web/packages/bebop-jsp/www/test-master-def.jsp
deleted file mode 100755
index c65b8d5f5..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/test-master-def.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ taglib prefix="define" uri="/WEB-INF/bebop-define.tld" %>
-<%@ page import="com.arsdigita.bebop.*" %>
-<%@ page import="com.arsdigita.bebop.form.*" %>
-<%@ page import="com.arsdigita.bebop.event.*" %>
-
-<define:page name="p" title="Test Page">
-  <define:form name="myForm">
-    <% myForm.addSubmissionListener(new FormSubmissionListener() {
-             public void submitted(FormSectionEvent fse) { 
-                System.out.println("form submitted");
-             }
-         });
-     %>
-    <define:text name="foo" />
-    <define:submit name="bar" label="Submit! (name=bar)"/>
-  </define:form>
-</define:page>
diff --git a/ccm-core/web/packages/bebop-jsp/www/test-master-static.jsp b/ccm-core/web/packages/bebop-jsp/www/test-master-static.jsp
deleted file mode 100755
index c46d56bea..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/test-master-static.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ taglib prefix="show" uri="/WEB-INF/bebop-show.tld" %>
-
-<%@ include file="test-master-def.jsp" %>
-
-<show:page>
-<%@ include file="static-header.jsp" %>
-
-this is a slave page, which will display a form included from within
-another (master) page.
-  <show:form name="myForm">
-    input foo <show:component name="foo" />
-    <br>
-    input bar <show:component name="bar" />
-  </show:form>
-
-<%@ include file="static-footer.jsp" %>
-</show:page>
-
diff --git a/ccm-core/web/packages/bebop-jsp/www/test-master.jsp b/ccm-core/web/packages/bebop-jsp/www/test-master.jsp
deleted file mode 100755
index c2dfdd293..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/test-master.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-<%@ taglib prefix="show" uri="/WEB-INF/bebop-show.tld" %>
-
-<%@ include file="test-master-def.jsp" %>
-
-<show:page master="master-page.jsp">
-this is a slave page, which will display a form included from within
-another (master) page.
-  <show:form name="myForm">
-    input foo <show:component name="foo" />
-    <br>
-    input bar <show:component name="bar" />
-  </show:form>
-</show:page>
diff --git a/ccm-core/web/packages/bebop-jsp/www/test.jsp b/ccm-core/web/packages/bebop-jsp/www/test.jsp
deleted file mode 100755
index 107df25aa..000000000
--- a/ccm-core/web/packages/bebop-jsp/www/test.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%@ taglib prefix="show" uri="/WEB-INF/bebop-show.tld" %>
-
-<%-- basic JSP integration test, taking page definition from test-def --%>
-<%@ include file="test-def.jsp" %>
-
-<show:page>
-this is a test. Let's see if we can insert the form here:
-
-  <show:form name="myForm">
-  <ul>
-    <li>input widget: <show:component name="foo" />
-    <li>submit: <show:component name="bar" />
-  </ul>
-  </show:form>
-
-  <% if (request.getAttribute("test-def.submitted") != null) { %>
-    <font color="red">form was submitted with value
-       <%= request.getAttribute("test-def.submitted") %> </font>
-  <% } %>
-  <p> the advantage of not trying to parse this as XML is that we can
-  have badly-formed HTML here: 
-    <ul> <li> one <li> two <li> three </ul>
-
-</show:page>
diff --git a/ccm-core/web/packages/categorization/README b/ccm-core/web/packages/categorization/README
deleted file mode 100644
index c61c22c8a..000000000
--- a/ccm-core/web/packages/categorization/README
+++ /dev/null
@@ -1 +0,0 @@
-Seems not to be used by any package
diff --git a/ccm-core/web/packages/categorization/xsl/categorization.xsl b/ccm-core/web/packages/categorization/xsl/categorization.xsl
deleted file mode 100755
index 4242a23c6..000000000
--- a/ccm-core/web/packages/categorization/xsl/categorization.xsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" 
-        xmlns:categorization="http://www.arsdigita.com/categorization/1.0"
-        xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-
-<xsl:template match="categorization:objectCategories">
-  <b><xsl:value-of select="bebop:name"/></b>
-  <blockquote>
-    <xsl:apply-templates select="categorization:qualifiedCategoryName" />
-  </blockquote>
-</xsl:template>
-
-<xsl:template match="categorization:qualifiedCategoryName">
-   <xsl:value-of select="@qualifiedName"/><br />
-</xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-core/web/packages/login/xsl/login_en.xsl b/ccm-core/web/packages/login/xsl/login_en.xsl
deleted file mode 100755
index 4131c7332..000000000
--- a/ccm-core/web/packages/login/xsl/login_en.xsl
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" >
-<!ENTITY copy   "&#169;" >
-]>
-
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:subsite="http://www.arsdigita.com/subsite/1.0"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:ui="http://www.arsdigita.com/ui/1.0">
-
-  <xsl:import href="../../bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../ui/xsl/ui.xsl"/>
-
-  <xsl:param name="dispatcher-prefix"/>
-
-  <!-- new version of login page -->
-  <xsl:template match="bebop:page[@application='login']">
-  <!-- DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" -->
-  <html>
-  <head>
-    <title>Log in</title>
-
-    <link href="/css/acs-master.css" type="text/css" rel="stylesheet"/>
-  </head>
-
-  <body link="#000066" vlink="#333399" bgcolor="#FFFFFF">
-    <xsl:call-template name="bebop:dcpJavascript"/>
-    <xsl:apply-templates select="ui:userBanner" />
-
-    <p/>&nbsp;
-
-    <table width="75%" align="center" border="0" cellspacing="0" cellpadding="5">
-      <tr bgcolor="#cc000000">
-        <td align="center">
-          <div class="page-title"><font color="#ffffff"><xsl:value-of select="ui:siteBanner/@sitename" /></font></div>
-        </td>
-      </tr>
-      <tr bgcolor="#ffffff">
-        <td heigth="2"></td>
-      </tr>
-      <tr bgcolor="#e1e1e1">
-        <td>
-          <xsl:choose>
-            <xsl:when test="count(bebop:form)>0">
-              <xsl:apply-templates select="bebop:form"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="*[not(@metadata.tag)]"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </td>
-      </tr>
-    </table>
-    <p/>
-    &nbsp;
-
-    <xsl:apply-templates select="ui:siteBanner"/>
-    <xsl:apply-templates select="ui:debugPanel"/>
-    <xsl:apply-templates select="bebop:structure"/>
-  </body>
-  </html>
-  </xsl:template>
-
-  <!-- this rule matches one user -->
-  <xsl:template match="subsite:userInfo">
-    <hr />
-
-    <h3>What we tell other users about you</h3>
-
-      In general we identify content that you've posted by your full name.  In
-      an attempt to protect you from unsolicited bulk email (spam), we keep your
-      email address hidden except from other registered users.
-
-    <h4>Basic Information</h4>
-
-    <ul>
-      <li> Name: <xsl:value-of select="@name"/> </li>
-      <li> User ID:  <xsl:value-of select="@id"/> </li>
-      <li> Email Address:  <xsl:value-of select="@email"/> </li>
-      <li> Personal URL:  <xsl:value-of select="@URI"/> </li>
-      <li> Screen Name:  <xsl:value-of select="@screenName"/> </li>
-    </ul>
-
-    <xsl:apply-templates />
-
-  </xsl:template>
-
-  <xsl:template match="subsite:explainPersistentCookies">
-      Our server can tell your browser to remember certain things, such as your
-      email address and password.  This is convenient for you because, if you're
-      the only person who uses your computer, you won't have to keep telling us
-      your email address and password.
-      <p/>
-      It would be a very bad idea to choose this option if you're using a
-      shared computer in a library or school.  Any subsequent user of this machine
-      would be able to masquerade as you on our service.
-      <p/>
-      Note that you can erase your saved email address and password by choosing
-      the "log out" option from your workspace.
-      <p/>
-  </xsl:template>
-
-  <xsl:template match="subsite:loginPromptMsg[@class='email']">
-    <b>Current users:</b> Please enter your email and password below.
-    <p/>
-    <b>New users:</b> Please begin the registration process
-    by entering a valid email address and leaving the password field blank.
-    You will be directed to another form to complete your registration.
-    <p/>&nbsp;
-  </xsl:template>
-
-  <xsl:template match="subsite:loginPromptMsg[@class='screenName']">
-    <b>Current users:</b> Please enter your screen name and password below.
-    <p/>
-    <b>New users:</b> Please begin the registration process
-    by entering your desired screen name and leaving the password field blank.
-    You will be directed to another form to complete your registration.
-    <p/>&nbsp;
-  </xsl:template>
-
-  <xsl:template match="subsite:promptToEnableCookiesMsg">
-    <br />
-    <b>Note:</b> Our personalized web services require that your browser be enabled for JavaScript and cookies.
-  </xsl:template>
-
-  <xsl:template match="subsite:recoverPasswordMailSent">
-    You have been sent an email that will allow you to change your password.
-  </xsl:template>
-
-  <xsl:template match="subsite:recoverPasswordMailFailed">
-    Unable to send password recovery information via email.
-    <p/>
-    Please contact the system administrator for further help in recovering your password.
-  </xsl:template>
-
-  <xsl:template match="subsite:explainLoginExpired">
-    <p></p>
-    <font size="-1">
-      <table cellpadding="5" cellspacing="1" border="1">
-        <tr>
-          <td bgcolor="#ffffcc"><b>Note:</b> For security reasons, the login page
-            expires after a certain interval to prevent malicious attackers from logging
-            in as you using cached browser passwords.</td>
-        </tr>
-      </table>
-    </font>
-  </xsl:template>
-
-
-  <xsl:template match="subsite:contentCenters">
-    <h4>My Control Centers</h4>
-    <ul>
-    <xsl:for-each select="subsite:center">
-        <li>
-            <a>
-                <xsl:attribute name="href">
-                    <xsl:for-each select="subsite:url">
-                      <xsl:if test="position()=1">
-                        <xsl:value-of select="node()|text()" />
-                      </xsl:if>
-                    </xsl:for-each>
-                 </xsl:attribute>
-                <xsl:value-of select="@name" />
-            </a>
-        </li>
-    </xsl:for-each>
-    </ul>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/lucene/xsl/search.xsl b/ccm-core/web/packages/lucene/xsl/search.xsl
deleted file mode 100755
index 9493ec3b3..000000000
--- a/ccm-core/web/packages/lucene/xsl/search.xsl
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- 
-This is the main stylesheet for Bebop.  It imports all of the .xsl
-files with xsl.import.  This stylesheet is locale-independent. 
---> 
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-                xmlns:search="http://arsdigita.com/search/1.0">
-
-<xsl:import href="../../bebop/xsl/bebop.xsl"/>
-
-<xsl:template match="search:search">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="search:results">
-<xsl:if test="@size > 0">
-<table class="tabular">
-  <tr>
-    <th>Title</th>
-    <th>Summary</th>
-    <th>Created On</th>
-    <th>Modified On</th>
-    <th>Score</th>
-  </tr>
-  <xsl:for-each select="search:hit">
-    <tr>
-      <td>
-        <a>
-          <xsl:attribute name="href">
-             <xsl:value-of select="@url"/>
-          </xsl:attribute>
-          <xsl:value-of select="@title"/>
-        </a>
-      </td>
-      <td>
-        <xsl:value-of select="@summary"/>
-      </td>
-      <td>
-        <xsl:value-of select="@creationDate"/>
-      </td>
-      <td>
-        <xsl:value-of select="@lastModifiedDate"/>
-      </td>
-      <td>
-        <xsl:value-of select="@score"/>
-      </td>
-    </tr>
-  </xsl:for-each>
-</table>
-</xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
-
-
-
-
diff --git a/ccm-core/web/packages/search/xsl/search.xsl b/ccm-core/web/packages/search/xsl/search.xsl
deleted file mode 100755
index 33336c006..000000000
--- a/ccm-core/web/packages/search/xsl/search.xsl
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:search="http://rhea.redhat.com/search/1.0"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  version="1.0">
-
-  <xsl:output method="html"/>
-
-  <xsl:template match="search:results">
-    <!--
-         <xsl:apply-templates select="search:paginator" mode="page-summary"/>
-    -->
-    <xsl:apply-templates select="search:paginator" mode="results-summary"/>
-    <xsl:if test="search:paginator/@objectCount > 0">
-      <xsl:apply-templates select="search:documents"/>
-      <xsl:if test="search:paginator/@pageCount > 1">
-        <xsl:apply-templates select="search:paginator" mode="pages"/>
-      </xsl:if>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="search:paginator" mode="page-summary">
-    <xsl:if test="@objectCount > 0">
-      <div>
-        <xsl:text>Displaying page </xsl:text>
-        <xsl:value-of select="@pageNumber"/>
-        <xsl:text> of </xsl:text>
-        <xsl:value-of select="@pageCount"/>
-        <xsl:text> (maximum of </xsl:text>
-        <xsl:value-of select="@pageSize"/>
-        <xsl:text> results per page)</xsl:text>
-      </div>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="search:paginator" mode="results-summary">
-    <div>
-      <xsl:choose>
-        <xsl:when test="@objectCount = 0">
-          <xsl:text>There were no results for your search</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>Displaying results </xsl:text>
-          <xsl:value-of select="@objectBegin"/>
-          <xsl:text> through </xsl:text>
-          <xsl:value-of select="@objectEnd"/>
-          <xsl:if test="@pageCount > 1">
-            <xsl:text> (total: </xsl:text>
-            <xsl:value-of select="@objectCount"/>
-            <xsl:text>)</xsl:text>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="search:paginator" mode="pages">
-    <xsl:if test="@objectCount > 0">
-      <div>
-        <xsl:if test="@pageNumber > 1">
-          <a href="{@baseURL}&amp;{@pageParam}={@pageNumber - 1}">&lt;&lt;&lt;Previous </a>
-        </xsl:if>
-        <xsl:text>Page </xsl:text>
-        <xsl:value-of select="@pageNumber"/>
-        <xsl:text> of </xsl:text>
-        <xsl:value-of select="@pageCount"/>
-        <xsl:if test="@pageNumber &lt; @pageCount">
-          <a href="{@baseURL}&amp;{@pageParam}={@pageNumber + 1}"> Next &gt;&gt;&gt;</a>
-        </xsl:if>
-      </div>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="search:documents">
-    <table class="data" >
-      <thead>
-        <tr>
-          <th>Score</th>
-          <th>Title</th>
-          <th>Summary</th>
-        </tr>
-      </thead>
-      <tbody>
-        <xsl:for-each select="search:object">
-          <xsl:apply-templates select=".">
-            <xsl:with-param name="class">
-              <xsl:choose>
-                <xsl:when test="position() mod 2">odd</xsl:when>
-                <xsl:otherwise>even</xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:for-each>
-      </tbody>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="search:object">
-    <xsl:param name="class" select="none"/>
-
-    <tr class="{$class}">
-      <td><xsl:value-of select="@score"/></td>
-      <td><a href="{@url}"><xsl:value-of select="@title"/></a></td>
-      <td><em><xsl:value-of select="@summary"/></em></td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="search:query">
-    <table>
-      <xsl:for-each select="search:*">
-        <tr valign="top">
-          <xsl:apply-templates select="."/>
-          <td>
-            <!-- Pull in the Submit button, next to the terms field -->
-            <xsl:if test="name() = 'search:terms'">
-              <xsl:apply-templates select="../bebop:formWidget"/>
-            </xsl:if>
-          </td>
-        </tr>
-      </xsl:for-each>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="search:terms">
-    <th align="right">
-      <xsl:text>Query:</xsl:text>
-    </th>
-    <td>
-      <input size="30" type="text" name="{@param}" value="{@value}" title="Enter one or more search terms"/>
-    </td>
-  </xsl:template>
-
-  <xsl:template match="search:filter[@type='objectType']">
-    <th align="right">
-      <xsl:text>Types:</xsl:text>
-    </th>
-    <td>
-      <select size="10" name="{@param}" multiple="multiple">
-        <xsl:for-each select="search:objectType">
-          <xsl:sort select="@name"/>
-          <option value="{@name}">
-            <xsl:if test="@isSelected">
-              <xsl:attribute name="selected">selected</xsl:attribute>
-            </xsl:if>
-            <xsl:value-of select="@name"/>
-          </option>
-        </xsl:for-each>
-      </select>
-    </td>
-  </xsl:template>
-
-  <xsl:template match="search:filter[@type='category']">
-    <th align="right">
-      <xsl:text>Categories:</xsl:text>
-    </th>
-    <td>
-      <select size="10" name="{@param}" multiple="multiple">
-        <xsl:for-each select="search:category">
-          <xsl:sort select="@title"/>
-          <option value="{@oid}">
-            <xsl:if test="@isSelected">
-              <xsl:attribute name="selected">selected</xsl:attribute>
-            </xsl:if>
-            <xsl:value-of select="@title"/>
-          </option>
-        </xsl:for-each>
-      </select>
-      <br/>
-      <input type="checkbox" value="true">
-        <xsl:attribute name="name">
-          <xsl:value-of select="search:includeSubCats/@name"/>
-        </xsl:attribute>
-        <xsl:if test="search:includeSubCats/@value = 'true'">
-          <xsl:attribute name="checked">checked</xsl:attribute>
-        </xsl:if>
-      </input>
-      Include subcategories
-    </td>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/templating/stylesheet-paths.txt b/ccm-core/web/packages/templating/stylesheet-paths.txt
deleted file mode 100755
index 8d7be466e..000000000
--- a/ccm-core/web/packages/templating/stylesheet-paths.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- text -*-
-# This file locates stylesheets, if you are using the
-# "PatternStylesheetResolver". Please read the Javadoc for that file for
-# the full story.
-
-/packages/aplaws/xsl/::vhost::/::application::_::locale::.xsl
-/packages/aplaws/xsl/::vhost::/::application::.xsl
-/packages/aplaws/xsl/::application::_::locale::.xsl
-/packages/aplaws/xsl/::application::.xsl
-/packages/::application::/xsl/::application::_::locale::.xsl
-/packages/::application::/xsl/::application::.xsl
diff --git a/ccm-core/web/packages/toolbox/xsl/AbstractCollectionTable.xsl b/ccm-core/web/packages/toolbox/xsl/AbstractCollectionTable.xsl
deleted file mode 100755
index 3380a4d40..000000000
--- a/ccm-core/web/packages/toolbox/xsl/AbstractCollectionTable.xsl
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-                xmlns:km="http://www.arsdigita.com/km/1.0"
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
- 
- <xsl:param name="internal-theme"/>
- 
-
-<xsl:template match="bebop:table[@class='abstractCollectionTable']" xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-<table class="fancy" cellpadding="1" cellspacing="2" border="0">
-     <xsl:for-each select="@*[@name!='class']">
-       <xsl:attribute name="{name()}">
-         <xsl:value-of select="."/>
-       </xsl:attribute>
-     </xsl:for-each>
-    <xsl:for-each select="thead|bebop:thead"> 
-    <xsl:call-template name="abstractCollectionTableHead">
-      <xsl:with-param name="orderColumn" select="../@order"/>
-      <xsl:with-param name="direction" select="../@direction"/> 
-    </xsl:call-template>
-    </xsl:for-each>
-    <xsl:apply-templates select="bebop:tbody"/>
-</table>
-</xsl:template>
-
-<xsl:template name="abstractCollectionTableHead">
-  <xsl:param name="orderColumn">0</xsl:param>
-  <xsl:param name="direction">asc</xsl:param>
-  <tr class="table_header" bgcolor="#ffffff">
-    <xsl:for-each select="cell|bebop:cell">
-          <th class="table_header" nowrap="nowrap">
-            <xsl:text>&#160;</xsl:text>
-            <xsl:apply-templates/>
-            <xsl:choose>
-              <xsl:when test="(position()-1)=$orderColumn">
-              <xsl:text>&#160;</xsl:text>   
-              <img border="0">
-                <xsl:attribute name="src"><xsl:choose><xsl:when test="$direction='asc'"><xsl:value-of select="//@assets"/>{$internal-theme}/images/gray-triangle-up.gif</xsl:when><xsl:otherwise><xsl:value-of select="//@assets"/>{$internal-theme}/images/gray-triangle-down.gif</xsl:otherwise></xsl:choose></xsl:attribute>
-              </img>
-             </xsl:when> 
-             <xsl:otherwise>
-               <xsl:text>&#160;</xsl:text> 
-               <xsl:text>&#160;</xsl:text> 
-             </xsl:otherwise>
-           </xsl:choose>
-            <xsl:text>&#160;</xsl:text>
-           </th>
-    </xsl:for-each>
-  </tr>
-</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/toolbox/xsl/ControlBar.xsl b/ccm-core/web/packages/toolbox/xsl/ControlBar.xsl
deleted file mode 100755
index 5fef0a72e..000000000
--- a/ccm-core/web/packages/toolbox/xsl/ControlBar.xsl
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-
-<xsl:template match="bebop:controlBar">
-<table width="100%"><tr>
-    <xsl:for-each select="bebop:dimensionBar">
-    <td>
-        <table>
-        <tr>
-            <td align="center"><b><xsl:value-of select="bebop:label[@class='dimensionBarTitle']"/></b></td>
-        </tr>
-        <tr>
-            <td align="center">
-            <xsl:variable name="options" select="*[(name()='bebop:label' and @class='dimensionBarOption') or name()='bebop:link']"/>
-                <!-- xsl:choose>
-                    <xsl:when test="count($options) > 10">
-                        You probably don't want to use a slider bar here.
-                    </xsl:when>
-                    <xsl:otherwise>
-                    </xsl:otherwise>
-                </xsl:choose -->
-                    <xsl:for-each select="$options">
-                    <xsl:apply-templates select="."/>
-                    <xsl:if test="position()!=last()"> | </xsl:if>
-                    </xsl:for-each>
-            </td> 
-        </tr>
-        </table>
-    </td>
-    </xsl:for-each>
-</tr>
-</table>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/ui/xsl/debug-panel.xsl b/ccm-core/web/packages/ui/xsl/debug-panel.xsl
deleted file mode 100755
index b69689194..000000000
--- a/ccm-core/web/packages/ui/xsl/debug-panel.xsl
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE stylesheet [
-  <!ENTITY lf   "&#xa;" >]>
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:ui="http://www.arsdigita.com/ui/1.0"
-  exclude-result-prefixes="xsl bebop ui">
-
-	<xsl:output 
-	method="xml"
-	doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
-	doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-	indent="yes" />
-
-  <xsl:template match="ui:debugPanel">
-    <hr width="100%"/>
-    <h3>Debug Options</h3>
-    <table>
-      <xsl:apply-templates select="ui:debugLink"/>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="ui:debugLink">
-    <tr>
-      <td>
-        <a href="{@url}">
-          <img src="/assets/action-{@type}.png" width="14" height="14" border="0" alt="Debug"/>
-        </a>
-        <xsl:text>&#160;</xsl:text>
-        <a href="{@url}">
-          <xsl:value-of select="@title"/>
-        </a>
-      </td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="bebop:structure">
-    <xsl:apply-templates select="bebop:state"/>
-    <xsl:apply-templates select="bebop:params"/>
-    <xsl:variable name="selectedIdx" select="bebop:state/bebop:selected"/>
-    <h1>Page structure</h1>
-    <h2>Legend:</h2>
-    <ul>
-      <li style="color: FireBrick;">Branch visible, self visible</li>
-      <li style="color: HotPink;">Branch visible, self invisible</li>
-      <li style="color: LightPink;">Branch invisible, self visible</li>
-      <li style="color: LightSteelBlue;">Branch invisible, self-invisible</li>
-      <li style="font-weight: bold;">bold if selected</li>
-    </ul>
-    <pre>
-      <xsl:for-each select="bebop:component">
-        <xsl:call-template name="bebopComponent">
-          <xsl:with-param name="selectedIdx" select="$selectedIdx"/>
-        </xsl:call-template>
-      </xsl:for-each>
-    </pre>
-    <h1>XML before transformation</h1>
-    <pre>
-      <xsl:for-each select="/*">
-        <xsl:call-template name="bebopElement"/>
-      </xsl:for-each>
-    </pre>
-    <h1>Stack traces</h1>
-    <dl>
-      <xsl:for-each select="/*">
-        <xsl:call-template name="bebopClassnames"/>
-      </xsl:for-each>
-    </dl>
-  </xsl:template>
-
-  <xsl:template match="bebop:state">
-    <h1>State</h1>
-    <xsl:if test="bebop:selected">
-      <p>Selected: <a href="#selectedComponent"><xsl:value-of select="bebop:selected"/></a></p>
-    </xsl:if>
-    <xsl:if test="bebop:eventName/self::text()">
-      <p>Event: <xsl:value-of select="bebop:eventName"/>
-      Value: <xsl:value-of select="bebop:eventValue"/>
-      </p>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="bebop:params">
-    <h1>Params</h1>
-    <table border="0" cellpadding="1" cellspacing="0">
-      <xsl:for-each select="*">
-        <tr>
-          <td style="font-weight: bold;"><xsl:value-of select="@name"/></td>
-          <td><xsl:value-of select="."/></td>
-        </tr>
-      </xsl:for-each>
-    </table>
-  </xsl:template>
-
-  <xsl:template name="bebopComponent">
-    <xsl:param name="padding"/>
-    <xsl:param name="branchVisible" select="@isVisible"/>
-    <xsl:param name="selectedIdx"/>
-
-    <xsl:variable name="selfVisible" select="@isVisible = 'yes'"/>
-
-    <xsl:variable name="newPadding">
-      <xsl:choose>
-        <xsl:when test="count(following-sibling::*) > 0">
-          <xsl:value-of select="concat($padding, '|   ')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="concat($padding, '    ')"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <span style="color: LightGrey;">
-      <xsl:value-of select="concat($padding, '+-')"/>
-    </span>
-    <span>
-      <xsl:attribute name="style">
-        <xsl:call-template name="componentVisibility">
-          <xsl:with-param name="branchVisible" select="$branchVisible"/>
-          <xsl:with-param name="selfVisible" select="$selfVisible"/>
-        </xsl:call-template>
-        <xsl:if test="$selectedIdx = @idx">
-          font-weight: bold;
-        </xsl:if>
-      </xsl:attribute>
-      <xsl:if test="$selectedIdx = @idx">
-        <xsl:attribute name="id">selectedComponent</xsl:attribute>
-      </xsl:if>
-
-      <xsl:value-of select="@name"/>
-    </span>
-    <xsl:text>&#xa;</xsl:text>
-
-    <xsl:for-each select="*">
-      <xsl:call-template name="bebopComponent">
-        <xsl:with-param name="branchVisible" select="$branchVisible and $selfVisible"/>
-        <xsl:with-param name="selectedIdx" select="$selectedIdx"/>
-        <xsl:with-param name="padding" select="$newPadding"/>
-      </xsl:call-template>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="componentVisibility">
-    <xsl:param name="branchVisible"/>
-    <xsl:param name="selfVisible"/>
-
-    <xsl:choose>
-      <!-- test for the most common case first -->
-      <xsl:when test="not($branchVisible) and $selfVisible">color: LightPink;</xsl:when>
-      <xsl:when test="$branchVisible and $selfVisible">color: FireBrick;</xsl:when>
-      <xsl:when test="$branchVisible and not($selfVisible)">color: HotPink;</xsl:when>
-      <xsl:when test="not($branchVisible) and not($selfVisible)">color: LightSteelBlue;</xsl:when>
-      <xsl:otherwise>CANNOT GET HERE</xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="bebopElement">
-    <xsl:param name="breadCrumbs" select="1"/>
-    <xsl:param name="padding"/>
-
-    <xsl:variable name="newPadding">
-      <xsl:choose>
-        <xsl:when test="count(following-sibling::*) > 0">
-          <xsl:value-of select="concat($padding, '|   ')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="concat($padding, '    ')"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:call-template name="bebopPadding">
-      <xsl:with-param name="padding" select="concat($padding, '+-')"/>
-    </xsl:call-template>
-
-    <xsl:call-template name="bebopTag">
-      <xsl:with-param name="str" select="concat('&lt;', name())"/>
-    </xsl:call-template>
-    <xsl:call-template name="bebopAttributes">
-      <xsl:with-param name="breadCrumbs" select="$breadCrumbs"/>
-    </xsl:call-template>
-
-    <xsl:choose>
-      <xsl:when test="*|text()">
-        <xsl:call-template name="bebopTag">
-          <xsl:with-param name="str" select="'>'"/>
-        </xsl:call-template>
-        <xsl:call-template name="bebopClassnameAnchor">
-          <xsl:with-param name="breadCrumbs" select="$breadCrumbs"/>
-        </xsl:call-template>
-        <xsl:text>&lf;</xsl:text>
-
-        <xsl:for-each select="*[not(self::bebop:structure)]|text()">
-          <xsl:choose>
-            <xsl:when test="self::text()">
-              <xsl:call-template name="bebopPadding">
-                <xsl:with-param name="padding" select="concat($newPadding, '+-')"/>
-              </xsl:call-template>
-              <span style="color: SlateGrey;">
-                <xsl:call-template name="abbreviateString">
-                  <xsl:with-param name="str" select="normalize-space(.)"/>
-                </xsl:call-template>
-              </span>
-              <xsl:text>&lf;</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:call-template name="bebopElement">
-                <xsl:with-param name="breadCrumbs" select="concat($breadCrumbs, '.', count(preceding-sibling::*) + 1)"/>
-                <xsl:with-param name="padding" select="$newPadding"/>
-              </xsl:call-template>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:for-each>
-
-        <xsl:call-template name="bebopPadding">
-          <xsl:with-param name="padding">
-            <xsl:choose>
-              <xsl:when test="count(following-sibling::*) > 0">
-                <xsl:value-of select="concat($padding, '| ')"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="concat($padding, '  ')"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="bebopTag">
-          <xsl:with-param name="str" select="concat('&lt;/', name(), '>')"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="bebopTag">
-          <xsl:with-param name="str" select="'/>'"/>
-        </xsl:call-template>
-        <xsl:call-template name="bebopClassnameAnchor">
-          <xsl:with-param name="breadCrumbs" select="$breadCrumbs"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>&lf;</xsl:text>
-  </xsl:template>
-
-  <xsl:template name="bebopAttributes">
-    <xsl:param name="breadCrumbs"/>
-    <xsl:for-each select="@*[not(name() = 'bebop:classname')]">
-      <xsl:call-template name="bebopAttribute">
-        <xsl:with-param name="name" select="name()"/>
-        <xsl:with-param name="value" select="."/>
-      </xsl:call-template>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template name="bebopAttribute">
-    <xsl:param name="name"/>
-    <xsl:param name="value"/>
-
-    <xsl:text> </xsl:text>
-    <span style="color: DarkGreen;">
-      <xsl:value-of select="$name"/>
-    </span>
-    <xsl:text>=</xsl:text>
-    <span style="color: SaddleBrown;">
-      <xsl:value-of select="concat('&quot;', $value, '&quot;')"/>
-    </span>
-  </xsl:template>
-
-  <xsl:template name="bebopTag">
-    <xsl:param name="str"/>
-   <span style="color: Maroon; font-weight: bold;">
-      <xsl:value-of select="$str"/>
-    </span>
-  </xsl:template>
-
-  <xsl:template name="bebopPadding">
-    <xsl:param name="padding"/>
-    <span style="color: LightGrey;">
-      <xsl:value-of select="$padding"/>
-    </span>
-  </xsl:template>
-
-  <xsl:template name="abbreviateString">
-    <xsl:param name="str"/>
-    <xsl:variable name="strlen" select="string-length($str)"/>
-
-    <xsl:choose>
-      <xsl:when test="$strlen &lt; 60">
-        <xsl:value-of select="$str"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="concat(substring($str, 1, 30),
-                                     '...',
-                                     substring($str, $strlen - 30))"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="bebopClassnameAnchor">
-    <xsl:param name="breadCrumbs"/>
-    <xsl:if test="@bebop:classname">
-      <xsl:variable name="anchor" select="$breadCrumbs"/>
-      <sup><a href="#{$anchor}" id="back{$anchor}"><xsl:value-of select="$anchor"/></a></sup>
-    </xsl:if>
-  </xsl:template>
-
-
-  <xsl:template name="bebopClassnames">
-    <xsl:param name="breadCrumbs" select="1"/>
-
-    <xsl:if test="@bebop:classname">
-      <xsl:variable name="anchor" select="$breadCrumbs"/>
-      <dt><a id="{$anchor}" href="#back{$anchor}"><xsl:value-of select="$anchor"/></a></dt>
-      <dd>
-        <pre>
-          <xsl:value-of select="@bebop:classname"/>
-        </pre>
-      </dd>
-    </xsl:if>
-
-    <xsl:for-each select="*">
-      <xsl:call-template name="bebopClassnames">
-        <xsl:with-param name="breadCrumbs" select="concat($breadCrumbs, '.', count(preceding-sibling::*) + 1)"/>
-      </xsl:call-template>
-    </xsl:for-each>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/ui/xsl/simple-page.xsl b/ccm-core/web/packages/ui/xsl/simple-page.xsl
deleted file mode 100755
index 136744b4e..000000000
--- a/ccm-core/web/packages/ui/xsl/simple-page.xsl
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  xmlns:ui="http://www.arsdigita.com/ui/1.0"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-  
-  <xsl:import href="../../bebop/xsl/dcp.xsl"/>
-  <xsl:output method="html" indent="yes"/>
-  
-  <xsl:param name="context-prefix"/>
-  
-  <xsl:template name="ui:simplePage" match="bebop:page[@class='simplePage']" >
-    <html>
-      <head>
-        <title><xsl:call-template name="bebop:pageTitle"/></title>
-        <xsl:call-template name="bebop:pageCSS"/>
-      </head>
-      <body>
-        <xsl:call-template name="bebop:dcpJavascript"/>
-        <table width="100%" cellspacing="0" cellpadding="0" border="0">
-          <tr>
-            <td>
-              <xsl:apply-templates select="*[@metadata.tag='top']"/>
-            </td>
-          </tr>
-        </table>
-        
-        <table width="100%" cellspacing="0" cellpadding="0" border="0">
-          <tr>
-            <td bgcolor="#878175">
-              <table cellspacing="0" cellpadding="0" border="0">
-                <tr>
-                  <td height="1"></td>
-                </tr>
-              </table>
-            </td>
-         </tr>
-       </table>
-
-       <table width="100%" cellspacing="0" cellpadding="0" border="0">
-         <tr>
-           <td>
-             <table cellspacing="0" cellpadding="0" border="0">
-               <tr>
-                 <td height="4"></td>
-               </tr>
-             </table>
-           </td>
-         </tr>
-       </table>
-
-       <table width="100%" cellspacing="0" cellpadding="0" border="0">
-         <tr>
-           <td>
-             <div class="page-title">
-               <xsl:call-template name="bebop:pageTitle"/>
-             </div>
-           </td>
-         </tr>
-       </table>
-
-       <table width="100%" cellspacing="0" cellpadding="0" border="0">
-         <tr>
-           <td>
-             <table cellspacing="0" cellpadding="0" border="0">
-               <tr>
-                 <td height="4"></td>
-               </tr>
-             </table>
-           </td>
-         </tr>
-       </table>
-
-       <table width="100%" cellspacing="0" cellpadding="0" border="0">
-         <tr>
-           <td>
-             <xsl:apply-templates select="*[@metadata.tag='left']"/>
-           </td>
-           <td>
-             <xsl:apply-templates select="*[not(@metadata.tag)]"/>
-           </td>
-           <td>
-             <xsl:apply-templates select="*[@metadata.tag='right']"/>
-           </td>
-         </tr>
-       </table>
-
-       <table width="100%" cellspacing="0" cellpadding="0" border="0">
-         <tr>
-           <td>
-             <table cellspacing="0" cellpadding="0" border="0">
-               <tr>
-                 <td height="4"></td>
-               </tr>
-             </table>
-           </td>
-         </tr>
-       </table>
-
-       <table width="100%" cellspacing="0" cellpadding="0" border="0">
-         <tr>
-           <td bgcolor="#878175">
-             <table cellspacing="0" cellpadding="0" border="0">
-               <tr>
-                 <td height="1"></td>
-               </tr>
-             </table>
-           </td>
-         </tr>
-       </table>
-
-       <table width="100%" cellspacing="0" cellpadding="0" border="0">
-         <tr>
-           <td>
-             <xsl:apply-templates select="*[@metadata.tag='bottom']"/>
-           </td>
-         </tr>
-       </table>
-       
-       <xsl:apply-templates select="bebop:structure"/>
-     </body>
-   </html>
- </xsl:template>
-
-  <xsl:template match="bebop:tabbedPane[@id='page-body']">
-    <div class="tabbed-pane">
-      <table class="tab-set">
-        <tr>
-          <xsl:for-each select="bebop:tabStrip/bebop:tab">
-            <xsl:choose>
-              <xsl:when test="@current">
-                <td class="current-tab-label"><xsl:apply-templates/></td>
-
-                <td class="current-tab-end"/>
-              </xsl:when>
-
-              <xsl:otherwise>
-                <td class="tab-label"><a href="{@href}"><xsl:apply-templates/></a></td>
-
-                <td class="tab-end"/>
-              </xsl:otherwise>
-            </xsl:choose>
-
-            <td class="tab-spacer"/>
-          </xsl:for-each>
-        </tr>
-      </table>
-
-      <table class="rule">
-        <tr><td></td></tr>
-      </table>
-
-    </div>
-      <div class="current-pane">
-        <xsl:apply-templates select="bebop:currentPane/*"/>
-      </div>
-  </xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/ui/xsl/site-banner.xsl b/ccm-core/web/packages/ui/xsl/site-banner.xsl
deleted file mode 100755
index def6807ca..000000000
--- a/ccm-core/web/packages/ui/xsl/site-banner.xsl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    xmlns:ui="http://www.arsdigita.com/ui/1.0">
-  
- <xsl:output method="html" indent="yes"/>
- 
- 
- <xsl:template name="ui:siteBanner" match="ui:siteBanner" >
-   <div style="text-align: right; font-size: smaller">
-     If you encounter any problems using
-     <a>
-       <xsl:attribute name="href">http://<xsl:value-of select="@hostname"/>/</xsl:attribute>
-       <xsl:value-of select="@sitename"/></a>
-     please contact the
-     <a><xsl:attribute name="href">mailto:<xsl:value-of select="@admin"/></xsl:attribute>
-       site administrator</a>.
-   </div>
- </xsl:template>
-
-</xsl:stylesheet>
-
-
diff --git a/ccm-core/web/packages/ui/xsl/ui.xsl b/ccm-core/web/packages/ui/xsl/ui.xsl
deleted file mode 100755
index 61aa5c401..000000000
--- a/ccm-core/web/packages/ui/xsl/ui.xsl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- 
-A convenient collection of UI XSL templates
---> 
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-                xmlns:ui="http://www.arsdigita.com/ui/1.0">
-  
-  <!-- templates for each component -->
-  <xsl:import href="simple-page.xsl"/>
-  <xsl:import href="site-banner.xsl"/>
-  <xsl:import href="user-banner.xsl"/>
-  <xsl:import href="debug-panel.xsl"/>
-  
-</xsl:stylesheet>
-
-
-
-
diff --git a/ccm-core/web/packages/ui/xsl/url-encoding.xsl b/ccm-core/web/packages/ui/xsl/url-encoding.xsl
deleted file mode 100755
index 3fec605a4..000000000
--- a/ccm-core/web/packages/ui/xsl/url-encoding.xsl
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-  <!-- Having this output method=xml here is really unhelpful.
-  If the document is being output as HTML and you include this file
-  suddenly your HTML changes to XHTML halfway down the page which causes 
-  all sorts of problems. Tom Broxton for Runtime Collective 20040610 -->
-  <xsl:output method="xml" indent="yes" encoding="iso-8859-1"/>
-
-  <!-- ISO-8859-1 based URL-encoding demo
-       Written by Mike J. Brown, mike@skew.org.
-       Updated 2002-05-20.
-
-       No license; use freely, but credit me if reproducing in print.
-
-       Also see http://skew.org/xml/misc/URI-i18n/ for a discussion of
-       non-ASCII characters in URIs.
-  -->
-
-  <!-- Characters we'll support.
-       We could add control chars 0-31 and 127-159, but we won't. -->
-  <xsl:variable name="ascii"> !"#$%&amp;'()*+,-./0123456789:;&lt;=&gt;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~</xsl:variable>
-  <xsl:variable name="latin1">&#160;&#161;&#162;&#163;&#164;&#165;&#166;&#167;&#168;&#169;&#170;&#171;&#172;&#173;&#174;&#175;&#176;&#177;&#178;&#179;&#180;&#181;&#182;&#183;&#184;&#185;&#186;&#187;&#188;&#189;&#190;&#191;&#192;&#193;&#194;&#195;&#196;&#197;&#198;&#199;&#200;&#201;&#202;&#203;&#204;&#205;&#206;&#207;&#208;&#209;&#210;&#211;&#212;&#213;&#214;&#215;&#216;&#217;&#218;&#219;&#220;&#221;&#222;&#223;&#224;&#225;&#226;&#227;&#228;&#229;&#230;&#231;&#232;&#233;&#234;&#235;&#236;&#237;&#238;&#239;&#240;&#241;&#242;&#243;&#244;&#245;&#246;&#247;&#248;&#249;&#250;&#251;&#252;&#253;&#254;&#255;</xsl:variable>
-
-  <!-- Characters that usually don't need to be escaped -->
-  <xsl:variable name="safe">!'()*-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~</xsl:variable>
-
-  <xsl:variable name="hex" >0123456789ABCDEF</xsl:variable>
-
-  <xsl:template name="url-encode">
-    <xsl:param name="str"/>   
-    <xsl:if test="$str">
-      <xsl:variable name="first-char" select="substring($str,1,1)"/>
-      <xsl:choose>
-        <xsl:when test="contains($safe,$first-char)">
-          <xsl:value-of select="$first-char"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:variable name="codepoint">
-            <xsl:choose>
-              <xsl:when test="contains($ascii,$first-char)">
-                <xsl:value-of select="string-length(substring-before($ascii,$first-char)) + 32"/>
-              </xsl:when>
-              <xsl:when test="contains($latin1,$first-char)">
-                <xsl:value-of select="string-length(substring-before($latin1,$first-char)) + 160"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:message terminate="no">Warning: string contains a character that is out of range! Substituting "?".</xsl:message>
-                <xsl:text>63</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:variable>
-        <xsl:variable name="hex-digit1" select="substring($hex,floor($codepoint div 16) + 1,1)"/>
-        <xsl:variable name="hex-digit2" select="substring($hex,$codepoint mod 16 + 1,1)"/>
-        <xsl:value-of select="concat('%',$hex-digit1,$hex-digit2)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:if test="string-length($str) &gt; 1">
-        <xsl:call-template name="url-encode">
-          <xsl:with-param name="str" select="substring($str,2)"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/ui/xsl/user-banner.xsl b/ccm-core/web/packages/ui/xsl/user-banner.xsl
deleted file mode 100755
index 3a9df58a7..000000000
--- a/ccm-core/web/packages/ui/xsl/user-banner.xsl
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-    xmlns:ui="http://www.arsdigita.com/ui/1.0">
-  
- <xsl:output method="html" indent="yes"/>
- 
- <xsl:param name="internal-theme"/>
- 
- 
- <xsl:template name="ui:userBanner" match="ui:userBanner" >
-   <xsl:choose>
-    <!-- If a userID is set, then we know user is logged in. If not, -->
-    <!-- Log in message is presented...  -->
-     <xsl:when test="@userID">
-      <table class="globalAdminHeader">
-       <tr>
-        <!-- Shadow man logo by default -->
-        <!--<a href="http://www.redhat.com"><td class="globalLogo"></td></a>-->
-         <td id="logo"><img src="{$theme-prefix}/images/aplaws-logo-small.png" 
-                            height="30" width="30"/></td>
-         <td><xsl:text>&#160;&#160;&#160;&#160;&#160;&#160;</xsl:text></td>
-          <td style="margin: 0; border: 0; padding: 0;">
-           <table align="center" style="margin: 0; border: 0; padding: 0;">
-            <tr>
-             <td style="margin: 0; color: #3f3f3f; border: 0; padding: 0; padding-right: 18px;">
-             <xsl:value-of select="@greeting"/>
-             <xsl:text>&#160;</xsl:text>
-              <strong><xsl:value-of select="@givenName"/>
-               <xsl:text>&#160;</xsl:text>
-               <xsl:value-of select="@familyName"/>
-              </strong>
-             </td>
-            </tr>
-           </table>
-          </td>
-          <td style="margin: 0; border: 0; padding: 0;">
-           <table align="right" style="margin: 0; border: 0; padding: 0;">
-            <tr>
-<!-- Help going away for now, but retaining code -->
-<!--         <td class="global-link-icon">
-               <a href="/assets/help/toc_main.html">
-                 <img src="{$internal-theme}/images/lifesaver.png" 
-                      height="18" width="21"/>
-               </a>
-             </td>
-             <td class="global-link">
-               <a href="/assets/help/toc_main.html">
-                <xsl:value-of select="@helpLabel"/>
-               </a>
-             </td>
--->
-             <td class="global-link-icon">
-              <a>
-               <xsl:attribute name="href">
-                <xsl:value-of select="@workspaceURL"/>
-               </xsl:attribute>
-               <img src="{$internal-theme}/images/home.png" height="18" width="18"/>
-              </a>
-             </td>
-             <td class="global-link">
-               <a>
-                 <xsl:attribute name="href">
-                  <xsl:value-of select="@workspaceURL"/>
-                 </xsl:attribute>
-                <xsl:value-of select="@portalLabel"/> 
-               </a>
-             </td>
-
-             <td class="global-link-icon">
-              <a>
-               <xsl:attribute name="href">
-                 <xsl:value-of select="@logoutURL"/>
-               </xsl:attribute>
-               <img src="{$internal-theme}/images/lock.png" height="18" width="14"/>
-              </a>
-            </td>
-            <td class="global-link">
-              <a>
-               <xsl:attribute name="href">
-                 <xsl:value-of select="@logoutURL"/>
-               </xsl:attribute>
-               <xsl:value-of select="@signoutLabel"/> 
-              </a>
-            </td>
-         </tr>
-       </table>
-      </td>
-     </tr>
-    </table>
-     </xsl:when>
-     <xsl:otherwise>
-      <table class="globalAdminHeader">
-       <tr>
-        <!-- Shadow man logo by default -->
-        <!--<a href="http://www.redhat.com"><td class="globalLogo"></td></a>-->        
-        <td id="logo"><img src="{$theme-prefix}/images/aplaws-logo-small.png" 
-                           height="30" width="30"/></td>
-        <td><xsl:text>&#160;&#160;&#160;&#160;&#160;&#160;</xsl:text></td>
-        <td style="margin: 0; border: 0; padding: 0;">
-         <table align="center" style="margin: 0; border: 0; padding: 0;">
-          <tr>
-           <td style="margin: 0; color: #3f3f3f; border: 0; padding: 0; 
-                      padding-right: 18px;">
-            You are not currently logged in
-           </td>
-          </tr>
-         </table>
-        </td>
-        <td style="font-size: smaller; text-align: right">
-         <a>
-          <xsl:attribute name="href">
-           <xsl:value-of select="@loginURL"/>
-          </xsl:attribute>
-          Login
-         </a>
-       </td>
-       </tr>
-      </table>
-     </xsl:otherwise>
-   </xsl:choose>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-core/web/packages/versioning/header.jspf b/ccm-core/web/packages/versioning/header.jspf
index 6ffb01ef2..e3dab4fb1 100755
--- a/ccm-core/web/packages/versioning/header.jspf
+++ b/ccm-core/web/packages/versioning/header.jspf
@@ -1,6 +1,6 @@
 <html>
 <head>
   <title><%= (String) request.getAttribute("title") %></title>
-  <link href="/packages/versioning/vlog.css" rel="stylesheet" type="text/css"/>
+  <link href="vlog.css" rel="stylesheet" type="text/css"/>
 </head>
 <body>
diff --git a/ccm-core/web/themes/heirloom/apps/webdev-support/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/webdev-support/xsl/index.xsl
index 2837a13f0..12e0974f0 100644
--- a/ccm-core/web/themes/heirloom/apps/webdev-support/xsl/index.xsl
+++ b/ccm-core/web/themes/heirloom/apps/webdev-support/xsl/index.xsl
@@ -5,7 +5,7 @@
   xmlns:devsup="http://xmlns.redhat.com/waf/webdevsupport/1.0"
   version="1.0">
   
-  <xsl:import href="../../../../packages/login/xsl/login_en.xsl"/> 
+  <xsl:import href="../../../packages/login/xsl/login_en.xsl"/> 
   
   <xsl:template match="devsup:configList">
     <script language="JavaScript1.2">
diff --git a/ccm-core/web/themes/heirloom/packages/versioning/header.jspf b/ccm-core/web/themes/heirloom/packages/versioning/header.jspf
index 6ffb01ef2..e3dab4fb1 100644
--- a/ccm-core/web/themes/heirloom/packages/versioning/header.jspf
+++ b/ccm-core/web/themes/heirloom/packages/versioning/header.jspf
@@ -1,6 +1,6 @@
 <html>
 <head>
   <title><%= (String) request.getAttribute("title") %></title>
-  <link href="/packages/versioning/vlog.css" rel="stylesheet" type="text/css"/>
+  <link href="vlog.css" rel="stylesheet" type="text/css"/>
 </head>
 <body>
diff --git a/ccm-forum/web/themes/heirloom/packages/forum/xsl/forum.xsl b/ccm-forum/web/themes/heirloom/packages/forum/xsl/forum.xsl
index f9cb3a4d9..97e68ad3f 100755
--- a/ccm-forum/web/themes/heirloom/packages/forum/xsl/forum.xsl
+++ b/ccm-forum/web/themes/heirloom/packages/forum/xsl/forum.xsl
@@ -5,8 +5,8 @@
   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/themes/heirloom/packages/bebop/xsl/bebop.xsl"/>
+  <xsl:import href="../../../../ROOT/themes/heirloom/packages/ui/xsl/ui.xsl"/>
   -->
   <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
   -->
diff --git a/ccm-gen-aplaws/CHANGE_LOG b/ccm-gen-aplaws/CHANGE_LOG
deleted file mode 100644
index 6cd41ce0c..000000000
--- a/ccm-gen-aplaws/CHANGE_LOG
+++ /dev/null
@@ -1,11 +0,0 @@
-2011-05-12
-Adaptation in web to the relocation of default theme files (from __ccm__ to
-themes) and new names of modules ccm-ldn-portal and ccm-ldn-themes.
-
-2007-08-06:
-./ccm-shp-aplaws/src/WEB-INF/content-types/c...types/aplaws-mparticle-item.jsp
-   <define:page name="itemPage" application="content"
-changed to
-   <define:page name="itemPage" application="content-section"
-as is all other contenttyp jsp pages. Requires corresponding modification
-in the theme! 
diff --git a/ccm-gen-aplaws/application.xml b/ccm-gen-aplaws/application.xml
deleted file mode 100755
index 14ea75c97..000000000
--- a/ccm-gen-aplaws/application.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-gen-aplaws"
-  prettyName="Generic APLAWS"
-  version="6.6.0"
-  release="1"
-  webapp="ROOT">
-  <ccm:dependencies>
-    <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-ldn-subsite" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-portalworkspace" version="6.6.1" relation="ge"/>
-    <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
-    <!--  not required anymore (2007-06-09)
-    <ccm:requires name="ccm-ldn-dublin" version="6.6.0" relation="ge"/>
-    -->
-    <ccm:requires name="ccm-ldn-navigation" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-ldn-search" version="6.6.0" relation="ge"/>
-  </ccm:dependencies>
-
-  <ccm:directories>
-    <ccm:directory name="pdl"/>
-    <ccm:directory name="src"/>
-  </ccm:directories>
-
-  <ccm:contacts>
-    <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
-    <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
-  </ccm:contacts>
-
-  <ccm:description>
-    Service module which tailors the aplaws software to a specific purpose
-    and/or a specific site.
-    - setting up a categorization / terms system (cf. load.java)
-    - integrate custom spezific jsp's
-    - setting up custom specific configuration parameters (cf. the bundles)
-    - overwrite default classes by custom specific ones (cf. src/.../aplaws)
-    - provide a default theme, which meets accessibility requirements and
-      overwrites the default, table based design (cf. web/.../themes)
-    
-    This modules tailors APLAWS to a general purpose.
-    
-    APLAWS is a collaboration and content management system which is based upon
-    the Red Hat Web Application Framework, which is a platform for writing
-    database-backed web applications in Java. 
-  </ccm:description>
-</ccm:application>
diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-portal-admin.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-portal-admin.xsl
deleted file mode 100644
index 10f65c812..000000000
--- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal-workspace-portal-admin.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
-     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-       version="1.0">
-
-<!--  <xsl:import href="../../../__ccm__/apps/workspace/xsl/admin.xsl"/>  -->
-  <xsl:import href="../../heirloom/apps/portal-workspace/xsl/admin.xsl"/>
-  <xsl:import href="lib/page.xsl"/>
-
-  <xsl:param name="theme-prefix" />
-  <xsl:param name="context-prefix" />
-
-  <xsl:template name="aplaws:headerStyleSheets">
-    <link rel="stylesheet" href="{$context-prefix}/css/acs-master.css"
-          type="text/css" media="screen"/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/search-admin.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/search-admin.xsl
deleted file mode 100644
index 1d143a00e..000000000
--- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/search-admin.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  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: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-gen-aplaws/web/themes/static/aplaws-generic/search-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/search-index.xsl
deleted file mode 100644
index ba76bc478..000000000
--- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/search-index.xsl
+++ /dev/null
@@ -1,590 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  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: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"/>
-  -->
-  <!-- path to xsl if installed in the main (common) web context   
-  -->
-  <xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../__ccm__/apps/content-section/xsl/index.xsl"/>
-
-  <xsl:param name="context-prefix"/>
-  <xsl:param name="dispatcher-prefix" />
-  <xsl:param name="theme-prefix" />
-
-  <xsl:output 
-	method="html"
-	doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
-	doctype-system="http://www.w3.org/TR/html4/loose.dtd"
-	indent="yes" 
-  />
-	
-  <xsl:template match="bebop:page[@application='search']">
-    <html lang="en">
-	<head>
-		<title>APLAWS+: Search</title>
-		<xsl:call-template name="cssStyles"/>
-	</head>
-	
-	<body>
-        <xsl:call-template name="bebop:dcpJavascript"/>
-		<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="searchBreadcrumb"/>
-		<xsl:call-template name="searchBody"/>
-	</body>
-    </html>
-  </xsl:template>
-
-
-  <xsl:template name="searchBody">
-    <table id="mainLayout" width="100%" border="0" cellspacing="0" cellpadding="0" summary="This table is used for a three-column page layout">
-      <tr>
-        <td width="20%" rowspan="2" align="left" valign="top" id="LHS">
-		<!--LHS NAVIGATION -->
-		<xsl:call-template name="searchNav" />
-        </td>
-        <td colspan="2" align="left" valign="top" id="title">
-        	<!--MAIN CONTENT -->
-		<h1>Search</h1>
-	</td>
-      </tr>
-      <tr>
-        <td width="60%" align="left" valign="top" id="mainContent">
-		<span class="hide">|</span>
-	
-		<!--CONTENT -->
-		<a id="startcontent" title="Start of content"></a>
-		<span class="hide">|</span>
-		<xsl:call-template name="searchMain" />	
-	</td>
-	<td width="20%" height="400" align="left" valign="top" id="RHS">
-		<div id="related">
-		<h2>Search Options</h2>
-		<xsl:choose>
-		  <xsl:when test="@id='search'">
-		  <a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search</a><span class="hide">|</span>
-		  <a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search
-		  </a><span class="hide">|</span>
-		  </xsl:when>
-		  <xsl:when test="@id='advanced'">
-		  <a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
-		  <a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search
-		  </a><span class="hide">|</span>
-		  </xsl:when>
-		  <xsl:when test="@id='remote'">
-			<a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
-			<a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search
-			</a><span class="hide">|</span>
-		  </xsl:when>
-		  <xsl:otherwise />
-		</xsl:choose>
-		</div>
-
-		<xsl:call-template name="sponsoredLinks"/>
-
-    	</td>
-      </tr>
-    </table>
-
-    <xsl:call-template name="footer"/>
-  </xsl:template>
-
-
-  <xsl:template name="searchBreadcrumb">
-    <!--BREADCRUMB -->
-
-    <div id="bread">
-    <p>
-    <b><a href="{$dispatcher-prefix}/portal/" title="home">home</a></b>
-    <xsl:text disable-output-escaping="yes">&amp;</xsl:text>gt;
-    <span class="breadHi">
-    <xsl:choose>
-	<xsl:when test="@id='search'">Search</xsl:when>
-      	<xsl:when test="@id='advanced'">Advanced Search</xsl:when>
-      	<xsl:when test="@id='remote'">Remote Search</xsl:when>
-	<xsl:otherwise />
-    </xsl:choose>
-    </span>
-    </p>
-    </div>
-  </xsl:template>
-
-
-  <xsl:template name="searchNav">
-    <div id="nav">
-    <div class="navUp">
-    <a href="{$dispatcher-prefix}/portal/">
-    <xsl:attribute name="title">up to homepage</xsl:attribute>
-    <xsl:text disable-output-escaping="yes">&amp;</xsl:text>#094;
-    <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;home</a>
-    </div>
-    <xsl:choose>
-	<xsl:when test="@id='search'">
-	<div class="navHere"><p>Search</p></div>		
-	</xsl:when>
-    	<xsl:when test="@id='advanced'">
-	<div class="navHere"><p>Advanced search</p></div>		
-	</xsl:when>
-    	<xsl:when test="@id='remote'">
-	<div class="navHere"><p>Remote search</p></div>		
-	</xsl:when>
-	<xsl:otherwise />
-    </xsl:choose>
-    <a href="/searchhelp" class="navChild" title="Hints and tips" >Hints and Tips</a><span class="hide">|</span>
-    </div>
-  </xsl:template>

-
-  <xsl:template name="searchMain">
-    <xsl:choose>
-	<xsl:when test="@id='search'">
-        	<xsl:call-template name="basicSearch" />
-      	</xsl:when>
-      	<xsl:when test="@id='advanced'">
-        	<xsl:call-template name="advancedSearch" />
-      	</xsl:when>
-      	<xsl:when test="@id='remote'">
-        	<xsl:call-template name="remoteSearch" />
-      	</xsl:when>
-	<xsl:when test="@id='reindex'">
-		<xsl:apply-templates/>
-	</xsl:when>
-	<xsl:otherwise />
-     </xsl:choose>
-  </xsl:template>
-
-
-  <xsl:template name="basicSearch">
-    <xsl:for-each select="bebop:form[@name='search']">
-      <div id="searchArea">
-		<div id="resultsInfo">
-		<xsl:choose>
-		<xsl:when test="//search:results"><xsl:apply-templates select="//search:paginator"  mode="results-summary"/></xsl:when>
-		<xsl:otherwise>Explanation of Search</xsl:otherwise>
-		</xsl:choose>
-		</div>
-		
-		<form name="{@name}" method="get" action="{@action}">
-		<span class="searchAgain">Type your query:</span>
-			<label class="searchLabel" for="mainSearch">Search</label>
-			<input class="searchBox" id="mainSearch" name="terms">
-			<xsl:attribute name="value"><xsl:value-of select="./search:query/search:terms/@value" /></xsl:attribute>
-			</input>
-			<div id="advGo">
-			<label class="searchLabel" for="basicSearchGo">Go</label>
-			<input type="submit" name="Submit" id="basicSearchGo" value="search" class="adgo" />
-			</div>
-		 <xsl:apply-templates select="bebop:pageState" />
-		</form>
-      </div>
-    </xsl:for-each>
-    <xsl:call-template name="searchResults" />
-  </xsl:template>
-
-
-  <xsl:template name="advancedSearch">
-    <xsl:for-each select="bebop:form[@name='search']">
-        <div id="searchArea">
-		<div id="resultsInfo">
-		<xsl:choose>
-		<xsl:when test="//search:results"><xsl:apply-templates select="//search:paginator"  mode="results-summary"/></xsl:when>
-		<xsl:otherwise>Explanation of Advanced Search</xsl:otherwise>
-		</xsl:choose>
-		</div>
-		
-		<form name="{@name}" method="get" action="{@action}">
-		<span class="searchAgain">Type your query:</span>
-		<label class="searchLabel" for="advancedSearch">Advanced Search</label>
-		<input class="searchBox" id="advancedSearch" name="terms">
-			<xsl:attribute name="value"><xsl:value-of select="./search:query/search:terms/@value" /></xsl:attribute>
-		</input>
-			
-		<div class="searchExplanation">Select the content types you would like to search</div>
-		<xsl:for-each select="./search:query/search:filter[@param='contentType']">
-		
-		<label class="searchLabel" for="advancedS">Content Types</label>
-		<select id="advancedS" size="10" name="{@param}" multiple="multiple">
-					<label class="filterTerm" for="advlisthead">adv list head</label>
-					<option id="advlisthead">Select Content Types</option>
-          
-					<xsl:for-each select="search:contentType">
-          <xsl:sort select="@title"/>
-          <label class="filterTerm" for="{@title}"><xsl:value-of select="@title" /></label>
-					<option id="{@title}" value="{@name}">
-            <xsl:if test="@isSelected">
-              <xsl:attribute name="selected">selected</xsl:attribute>
-            </xsl:if>
-            <xsl:value-of select="@title"/>
-          </option>
-        </xsl:for-each>
-    </select>
-		
-		</xsl:for-each>
-		<div id="advGo">
-		<label class="searchLabel" for="advancedSearchGo">Go</label>
-		<input type="submit" name="Submit" id="advancedSearchGo" value="search" class="adgo" />
-		</div>
-		<xsl:apply-templates select="bebop:pageState" />
-		</form>
-        </div>
-    </xsl:for-each>
-    <xsl:call-template name="searchResults" />
-  </xsl:template>
-
-
-  <xsl:template name="remoteSearch">
-    <xsl:for-each select="bebop:form[@name='search']">
-      <div id="searchArea">
-		<div id="resultsInfo">
-		<xsl:choose>
-		<xsl:when test="//search:results"><xsl:apply-templates select="//search:paginator"  mode="results-summary"/></xsl:when>
-		<xsl:otherwise>Explanation of Remote Search</xsl:otherwise>
-		</xsl:choose>
-		</div>
-
-		<form name="{@name}" method="get" action="{@action}">
-		<span class="searchAgain">Type your query:</span>
-		<label class="searchLabel" for="remoteSearch">Remote Search</label>
-		<input class="searchBox" id="remoteSearch" name="terms">
-		<xsl:attribute name="value"><xsl:value-of select="./search:query/search:terms/@value" /></xsl:attribute>
-		</input>
-			
-		<div class="searchExplanation">Select the connected websites you would like to search</div>
-		
-		<xsl:for-each select="./search:query/search:filter[@param='searchHost']">
-
-		<label class="searchLabel" for="remoteS">Site Select</label>
-		<select id="remoteS" size="5" name="{@param}" multiple="multiple">
-					<label class="filterTerm" for="remotelisthead">remote list head</label>
-					<option id="remotelisthead">Select remote site</option>
-          
-					<xsl:for-each select="search:searchHost">
-          <label class="filterTerm" for="{@title}"><xsl:value-of select="@title" /></label>
-					<option id="{@title}" value="{@oid}">
-            <xsl:if test="@isSelected">
-              <xsl:attribute name="selected">selected</xsl:attribute>
-            </xsl:if>
-            <xsl:value-of select="@title"/>
-          </option>
-        </xsl:for-each>
-    </select>
-		
-		</xsl:for-each>
-
-		
-
-		<div id="advGo">
-		<label class="searchLabel" for="remoteSearchGo">Go</label>
-		<input type="submit" name="Submit" id="remoteSearchGo" value="search" class="adgo" />
-		</div>
-		<xsl:apply-templates select="bebop:pageState" />
-		</form>
-        </div>
-    </xsl:for-each>
-  <xsl:call-template name="searchResults" />
-  </xsl:template>
-
-
-<xsl:template name="sponsoredLinks">
-<xsl:for-each select="./bebop:table[@id='SponsoredLinks']">
-<div id="sLinks">
-<h2>Quick Matches</h2>
-
-<xsl:for-each select="bebop:tbody/bebop:trow">
-<div class="sLink">
-<a href="{./bebop:cell[1]/bebop:link/@href}" title="{./bebop:cell[1]/bebop:link/@href}"><xsl:value-of select="./bebop:cell[1]/bebop:link/bebop:label" /></a>
-<xsl:value-of select="./bebop:cell[2]/bebop:label" />
-</div>
-</xsl:for-each>
-
-</div>
-</xsl:for-each>
-</xsl:template>
-
-
-
-
-<xsl:template name="searchResults">
-<xsl:for-each select="search:results">
-<div id="resultsList">
-		<div><xsl:apply-templates select="search:paginator"  mode="current-summary"/></div>
-		<xsl:for-each select="search:documents/search:object">
-		<div class="searchResult">
-		<a href="{@url}" title="{@title}">
-		<xsl:value-of select="@title" />
-		</a>
-		<xsl:value-of select="@summary" />
-		</div>
-		<span class="hide">|</span>
-		</xsl:for-each>
-</div>
-<xsl:apply-templates select="search:paginator"  mode="pages"/>
-</xsl:for-each>
-</xsl:template>
-
-
-
-
-<xsl:template match="search:paginator" mode="results-summary">
-You searched for <b><xsl:value-of select="//search:query/search:terms/@value" /></b> <xsl:text disable-output-escaping="yes">&amp;</xsl:text>gt;
-<xsl:choose>
-	<xsl:when test="@objectCount = 0">
-		<xsl:text>There were no results for your search</xsl:text>
-	</xsl:when>
-	<xsl:otherwise>
-		<span class="resultsTotal"><xsl:value-of select="@objectCount"/>
-		<xsl:text> results found</xsl:text>
-		</span>
-	</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-
-  
-  
-
-
-
-<xsl:template match="search:paginator" mode="current-summary">
-<div>
-<xsl:choose>
-	<xsl:when test="@objectCount = 0">
-		<xsl:text>There were no results for your search</xsl:text>
-	</xsl:when>
-	<xsl:otherwise>
-		<xsl:if test="@pageCount > 1">
-			<xsl:text>displaying results </xsl:text>
-			<xsl:value-of select="@objectBegin"/>
-			<xsl:text> to </xsl:text>
-			<xsl:value-of select="@objectEnd"/>
-</xsl:if>
-</xsl:otherwise>
-</xsl:choose>
-</div>
-</xsl:template>
-  
-  
-  <xsl:template match="search:paginator" mode="pages">
-    <div id="resultsPage">
-	
-		<xsl:if test="@objectCount > 0">
-      
-			<xsl:if test="@pageNumber > 1">
-          	<div id="pLeft">
-			<a href="{@baseURL}&amp;{@pageParam}={@pageNumber - 1}" title="previous page">
-              <xsl:text disable-output-escaping="yes">&amp;</xsl:text>lt; Previous page
-            </a>
-			</div>
-			<xsl:if test="@pageNumber = @pageCount">
-			<!--<div id="searchCenterL"> 
-			<xsl:text> page </xsl:text>
-        	<xsl:value-of select="@pageNumber"/>
-        	<xsl:text> of </xsl:text>
-        	<xsl:value-of select="@pageCount"/>
-			</div>-->
-			</xsl:if>
-			<!--<a href="{@baseURL}&amp;{@pageParam}={@pageNumber - 1}">previous page</a>-->
-
-		</xsl:if>
-        
-        <xsl:if test="@pageNumber &lt; @pageCount">
-          	<div id="pRight">
-			<a href="{@baseURL}&amp;{@pageParam}={@pageNumber + 1}" title="next page">
-              Next page <xsl:text disable-output-escaping="yes">&amp;</xsl:text>gt;
-            </a>
-			</div>
-			<!--<div id="searchCenterR"> 
-			<xsl:text> page </xsl:text>
-        	<xsl:value-of select="@pageNumber"/>
-        	<xsl:text> of </xsl:text>
-        	<xsl:value-of select="@pageCount"/>
-			</div>-->
-			
-			<!--<a href="{@baseURL}&amp;{@pageParam}={@pageNumber + 1}">next page</a>-->
-        </xsl:if>
-    </xsl:if>
-	</div>
-  </xsl:template>
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	<!-- IMPORTED REDHAT -->
- <xsl:template match="search:results">
-    <!--
-         <xsl:apply-templates select="search:paginator" mode="page-summary"/>
-    -->
-    <xsl:apply-templates select="search:paginator" mode="results-summary"/>
-    <xsl:if test="search:paginator/@objectCount > 0">
-      <xsl:apply-templates select="search:documents"/>
-      <xsl:if test="search:paginator/@pageCount > 1">
-        <xsl:apply-templates select="search:paginator" mode="pages"/>
-      </xsl:if>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="search:paginator" mode="page-summary">
-    <xsl:if test="@objectCount > 0">
-      <div>
-        <xsl:text>Displaying page </xsl:text>
-        <xsl:value-of select="@pageNumber"/>
-        <xsl:text> of </xsl:text>
-        <xsl:value-of select="@pageCount"/>
-        <xsl:text> (maximum of </xsl:text>
-        <xsl:value-of select="@pageSize"/>
-        <xsl:text> results per page)</xsl:text>
-      </div>
-    </xsl:if>
-  </xsl:template>
-
-
-
-  <xsl:template match="search:documents">
-    <table class="data" >
-      <thead>
-        <tr>
-          <th>Score</th>
-          <th>Title</th>
-          <th>Summary</th>
-        </tr>
-      </thead>
-      <tbody>
-        <xsl:for-each select="search:object">
-          <xsl:apply-templates select=".">
-            <xsl:with-param name="class">
-              <xsl:choose>
-                <xsl:when test="position() mod 2">odd</xsl:when>
-                <xsl:otherwise>even</xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:for-each>
-      </tbody>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="search:object">
-    <xsl:param name="class" select="none"/>
-
-    <tr class="{$class}">
-      <td><xsl:value-of select="@score"/></td>
-      <td><a href="{@url}"><xsl:value-of select="@title"/></a></td>
-      <td><em><xsl:value-of select="@summary"/></em></td>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="search:query">
-    <table>
-      <xsl:for-each select="search:*">
-        <tr valign="top">
-          <xsl:apply-templates select="."/>
-          <td>
-            <!-- Pull in the Submit button, next to the terms field -->
-            <xsl:if test="name() = 'search:terms'">
-              <xsl:apply-templates select="../bebop:formWidget"/>
-            </xsl:if>
-          </td>
-        </tr>
-      </xsl:for-each>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="search:terms">
-    <th align="right">
-      <xsl:text>Query:</xsl:text>
-    </th>
-    <td>
-      <input size="30" type="text" name="{@param}" value="{@value}" title="Enter one or more search terms"/>
-    </td>
-  </xsl:template>
-
-  <xsl:template match="search:filter[@type='objectType']">
-    <th align="right">
-      <xsl:text>Types:</xsl:text>
-    </th>
-    <td>
-      <select size="10" name="{@param}" multiple="multiple">
-        <xsl:for-each select="search:objectType">
-          <xsl:sort select="@name"/>
-          <option value="{@name}">
-            <xsl:if test="@isSelected">
-              <xsl:attribute name="selected">selected</xsl:attribute>
-            </xsl:if>
-            <xsl:value-of select="@name"/>
-          </option>
-        </xsl:for-each>
-      </select>
-    </td>
-  </xsl:template>
-
-  <xsl:template match="search:filter[@type='category']">
-    <th align="right">
-      <xsl:text>Categories:</xsl:text>
-    </th>
-    <td>
-      <select size="10" name="{@param}" multiple="multiple">
-        <xsl:for-each select="search:category">
-          <xsl:sort select="@title"/>
-          <option value="{@oid}">
-            <xsl:if test="@isSelected">
-              <xsl:attribute name="selected">selected</xsl:attribute>
-            </xsl:if>
-            <xsl:value-of select="@title"/>
-          </option>
-        </xsl:for-each>
-      </select>
-    </td>
-  </xsl:template> 
-
-<!--
-<xsl:template match="bebop:formWidget">
-    <xsl:element name="input">
-        <xsl:for-each select="@*">
-            <xsl:attribute name="{name()}">
-                <xsl:value-of select="."/>
-            </xsl:attribute>
-        </xsl:for-each>
-    </xsl:element>
- </xsl:template>
--->
- 
-  <xsl:template match="bebop:pageState">
-    <input>
-        <xsl:attribute name="type">hidden</xsl:attribute>
-        <xsl:for-each select="@*">
-            <xsl:attribute name="{name()}">
-                <xsl:value-of select="."/>
-            </xsl:attribute>
-        </xsl:for-each>
-    </input>
- </xsl:template>
- 
- </xsl:stylesheet>
diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.css
deleted file mode 100644
index 4210f401a..000000000
--- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url(/css/acs-master.css);
diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.xsl
deleted file mode 100644
index a4e103c89..000000000
--- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-  version="1.0">
-
-  <!-- path if installed in its own web context ccm-ldn-shortcuts
-    <xsl:import href="../../../../ccm-ldn-shortcuts/__ccm__/apps/shortcuts/xsl/index.xsl"/>
-  -->
-  <!-- path to xsl if installed in the main (common) web context   
-  -->
-  <xsl:import href="../../../__ccm__/apps/shortcuts/xsl/index.xsl"/>
-  <xsl:import href="lib/page.xsl"/>
-
-  <xsl:param name="theme-prefix"/>
-
-  <xsl:template name="aplaws:headerStyleSheets">
-    <link rel="stylesheet" href="{$theme-prefix}/shortcuts-index.css" type="text/css" media="screen"/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.css
deleted file mode 100644
index 4210f401a..000000000
--- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url(/css/acs-master.css);
diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.xsl
deleted file mode 100644
index cb04a688c..000000000
--- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.xsl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-  version="1.0">
-
-  <!-- path if installed in its own web context ccm-ldn-subsite
-  <xsl:import href="../../../../ccm-ldn-subsite/__ccm__/apps/subsite/xsl/index.xsl"/>
-  -->
-  <!-- path to xsl if installed in the main (common) web context   
-  -->
-  <xsl:import href="../../../__ccm__/apps/subsite/xsl/index.xsl"/>
-
-  <xsl:import href="lib/page.xsl"/>
-
-  <xsl:param name="theme-prefix"/>
-
-  <xsl:template name="aplaws:headerStyleSheets">
-    <link rel="stylesheet" href="{$theme-prefix}/subsite-index.css" type="text/css" media="screen"/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.css
deleted file mode 100644
index 15fd56956..000000000
--- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@import url(/css/acs-master.css);
-/* Following import is valid if terms is executed in its own     */
-/* web application context (ccm-ldn-terms)                       */
-/* @import url(/ccm-ldn-terms/__ccm__/apps/terms/xsl/index.css); */
-/* import if installed in the main (common) web context          */
-@import url(/__ccm__/apps/terms/xsl/index.css); 
diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.xsl
deleted file mode 100644
index 0ee053d22..000000000
--- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-  version="1.0">
-
-  <!-- path if installed in its own web context ccm-ldn-terms
-  <xsl:import href="../../../../ccm-ldn-terms/__ccm__/apps/terms/xsl/index.xsl"/>
-  -->
-  <!-- path to xsl if installed in the main (common) web context   
-  -->
-  <xsl:import href="../../../__ccm__/apps/terms/xsl/index.xsl"/>
-  <xsl:import href="lib/page.xsl"/>
-
-  <xsl:param name="theme-prefix"/>
-
-  <xsl:template name="aplaws:headerStyleSheets">
-    <link rel="stylesheet" href="{$theme-prefix}/terms-index.css" type="text/css" media="screen"/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.css
deleted file mode 100644
index 4210f401a..000000000
--- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url(/css/acs-master.css);
diff --git a/ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.xsl
deleted file mode 100644
index 3f85303aa..000000000
--- a/ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.xsl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-  version="1.0">
-
-  <!-- path if installed in its own web context ccm-ldn-theme
-  <xsl:import href="../../../../ccm-ldn-theme/__ccm__/apps/theme/xsl/index.xsl"/>
-  -->
-  <!-- path to xsl if installed in the main (common) web context   
-  -->
-  <xsl:import href="../../heirloom/apps/themedirector/xsl/index.xsl"/>
-
-  <xsl:import href="lib/page.xsl"/>
-
-  <xsl:param name="theme-prefix"/>
-
-  <xsl:template name="aplaws:headerStyleSheets">
-    <link rel="stylesheet" href="{$theme-prefix}/theme-index.css" type="text/css" media="screen"/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-admin.css b/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-admin.css
index 54c8c5bc3..0266bc9ac 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-admin.css
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-admin.css
@@ -1,2 +1,2 @@
-@import url("/css/acs-master.css");
-@import url("/__ccm__/static/atoz/atoz.css");
+@import url("../../heirloom/css/acs-master.css");
+@import url("../../heirloom/apps/atoz/lib/atoz.css");
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-index.css b/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-index.css
index 54c8c5bc3..0266bc9ac 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-index.css
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-index.css
@@ -1,2 +1,2 @@
-@import url("/css/acs-master.css");
-@import url("/__ccm__/static/atoz/atoz.css");
+@import url("../../heirloom/css/acs-master.css");
+@import url("../../heirloom/apps/atoz/lib/atoz.css");
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 59fde8128..94f34946a 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,1312 +1,1312 @@
 <?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/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/themes/heirloom/packages/bebop/xsl/bebop.xsl" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/packages/ui/xsl/ui.xsl" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/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.css b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/forum-index.css
index 74c5d3a59..c398a3e27 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/forum-index.css
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/forum-index.css
@@ -1,7 +1,7 @@
 @import url("css/main.css");
 /* Chris presumably forgot the ! to comment the following 2 lines out
-/* <--@import url("/css/acs-master.css");-->   */
-/* <--@import url("/css/tabbed-pane/tabbed-pane.css");-->  */
+/* <--@import url("/themes/heirloom/css/acs-master.css");-->   */
+/* <--@import url("/themes/heirloom/css/tabbed-pane/tabbed-pane.css");-->  */
 
 
 body {
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-index.css b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-index.css
index 74c5d3a59..c398a3e27 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-index.css
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-index.css
@@ -1,7 +1,7 @@
 @import url("css/main.css");
 /* Chris presumably forgot the ! to comment the following 2 lines out
-/* <--@import url("/css/acs-master.css");-->   */
-/* <--@import url("/css/tabbed-pane/tabbed-pane.css");-->  */
+/* <--@import url("/themes/heirloom/css/acs-master.css");-->   */
+/* <--@import url("/themes/heirloom/css/tabbed-pane/tabbed-pane.css");-->  */
 
 
 body {
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 82314d163..439674c51 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/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/themes/heirloom/packages/bebop/xsl/bebop.xsl" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/packages/ui/xsl/ui.xsl" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/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-atoz/web/themes/heirloom/apps/atoz/xsl/index.xsl b/ccm-ldn-atoz/web/themes/heirloom/apps/atoz/xsl/index.xsl
index 5e4e2e973..f5d83f748 100755
--- a/ccm-ldn-atoz/web/themes/heirloom/apps/atoz/xsl/index.xsl
+++ b/ccm-ldn-atoz/web/themes/heirloom/apps/atoz/xsl/index.xsl
@@ -6,13 +6,6 @@
   xmlns:atoz="http://xmlns.redhat.com/atoz/1.0"
   version="1.0">
 
-  <!-- IMPORT DEFINITIONS ccm-ldn-atoz 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/__ccm__/static/cms/admin/category-step/category-step.xsl"/>
-  -->
-  <!-- IMPORT DEFINITIONS ccm-ldn-atoz 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/cms/xsl/admin/category-step/category-step.xsl"/>
diff --git a/ccm-ldn-search/web/themes/heirloom/apps/search/xsl/index.xsl b/ccm-ldn-search/web/themes/heirloom/apps/search/xsl/index.xsl
index 638367453..7deb79957 100755
--- a/ccm-ldn-search/web/themes/heirloom/apps/search/xsl/index.xsl
+++ b/ccm-ldn-search/web/themes/heirloom/apps/search/xsl/index.xsl
@@ -4,12 +4,6 @@
                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
                    version="1.0">
 
-  <!-- IMPORT DEFINITIONS ccm-ldn-search 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/search/xsl/search.xsl"/>
-  <xsl:import href="../../../../../ROOT/__ccm__/static/cms/admin/search/search.xsl"/>
-  -->
 
   <!-- IMPORT DEFINITIONS ccm-ldn-search installed into the main CCM webapp
   -->
diff --git a/ccm-quasi-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css b/ccm-quasi-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css
index 74c5d3a59..c398a3e27 100644
--- a/ccm-quasi-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css
+++ b/ccm-quasi-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css
@@ -1,7 +1,7 @@
 @import url("css/main.css");
 /* Chris presumably forgot the ! to comment the following 2 lines out
-/* <--@import url("/css/acs-master.css");-->   */
-/* <--@import url("/css/tabbed-pane/tabbed-pane.css");-->  */
+/* <--@import url("/themes/heirloom/css/acs-master.css");-->   */
+/* <--@import url("/themes/heirloom/css/tabbed-pane/tabbed-pane.css");-->  */
 
 
 body {
diff --git a/ccm-quasi-bundle/web/themes/static/aplaws-generic/forum-index.css b/ccm-quasi-bundle/web/themes/static/aplaws-generic/forum-index.css
index 74c5d3a59..c398a3e27 100644
--- a/ccm-quasi-bundle/web/themes/static/aplaws-generic/forum-index.css
+++ b/ccm-quasi-bundle/web/themes/static/aplaws-generic/forum-index.css
@@ -1,7 +1,7 @@
 @import url("css/main.css");
 /* Chris presumably forgot the ! to comment the following 2 lines out
-/* <--@import url("/css/acs-master.css");-->   */
-/* <--@import url("/css/tabbed-pane/tabbed-pane.css");-->  */
+/* <--@import url("/themes/heirloom/css/acs-master.css");-->   */
+/* <--@import url("/themes/heirloom/css/tabbed-pane/tabbed-pane.css");-->  */
 
 
 body {
diff --git a/ccm-quasi-bundle/web/themes/static/aplaws-generic/navigation-admin.css b/ccm-quasi-bundle/web/themes/static/aplaws-generic/navigation-admin.css
index 49dd80c4e..41b5cdea9 100644
--- a/ccm-quasi-bundle/web/themes/static/aplaws-generic/navigation-admin.css
+++ b/ccm-quasi-bundle/web/themes/static/aplaws-generic/navigation-admin.css
@@ -1,2 +1,2 @@
-@import url("/css/acs-master.css");
+@import url("/themes/heirloom/css/acs-master.css");
 @import url("/themes/heirloom/apps/navigation/xsl/admin.css");
diff --git a/ccm-quasi-bundle/web/themes/static/aplaws-generic/shortcuts-index.css b/ccm-quasi-bundle/web/themes/static/aplaws-generic/shortcuts-index.css
index 4210f401a..8b66ce665 100644
--- a/ccm-quasi-bundle/web/themes/static/aplaws-generic/shortcuts-index.css
+++ b/ccm-quasi-bundle/web/themes/static/aplaws-generic/shortcuts-index.css
@@ -1 +1 @@
-@import url(/css/acs-master.css);
+@import url(/themes/heirloom/css/acs-master.css);
diff --git a/ccm-quasi-bundle/web/themes/static/aplaws-generic/subsite-index.css b/ccm-quasi-bundle/web/themes/static/aplaws-generic/subsite-index.css
index 4210f401a..8b66ce665 100644
--- a/ccm-quasi-bundle/web/themes/static/aplaws-generic/subsite-index.css
+++ b/ccm-quasi-bundle/web/themes/static/aplaws-generic/subsite-index.css
@@ -1 +1 @@
-@import url(/css/acs-master.css);
+@import url(/themes/heirloom/css/acs-master.css);
diff --git a/ccm-quasi-bundle/web/themes/static/aplaws-generic/terms-index.css b/ccm-quasi-bundle/web/themes/static/aplaws-generic/terms-index.css
index 15fd56956..b3e1b4f42 100644
--- a/ccm-quasi-bundle/web/themes/static/aplaws-generic/terms-index.css
+++ b/ccm-quasi-bundle/web/themes/static/aplaws-generic/terms-index.css
@@ -1,6 +1,6 @@
-@import url(/css/acs-master.css);
+@import url(/themes/heirloom/css/acs-master.css);
 /* Following import is valid if terms is executed in its own     */
 /* web application context (ccm-ldn-terms)                       */
 /* @import url(/ccm-ldn-terms/__ccm__/apps/terms/xsl/index.css); */
 /* import if installed in the main (common) web context          */
-@import url(/__ccm__/apps/terms/xsl/index.css); 
+@import url(/themes/heirloom/apps/terms/xsl/index.css); 
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl
index 59fde8128..94f34946a 100644
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl
+++ b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl
@@ -1,1312 +1,1312 @@
 <?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/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/themes/heirloom/packages/bebop/xsl/bebop.xsl" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/packages/ui/xsl/ui.xsl" />
+	<xsl:import href="../../../../ROOT/themes/heirloom/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-sci-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css
index 74c5d3a59..c398a3e27 100644
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css
+++ b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css
@@ -1,7 +1,7 @@
 @import url("css/main.css");
 /* Chris presumably forgot the ! to comment the following 2 lines out
-/* <--@import url("/css/acs-master.css");-->   */
-/* <--@import url("/css/tabbed-pane/tabbed-pane.css");-->  */
+/* <--@import url("/themes/heirloom/css/acs-master.css");-->   */
+/* <--@import url("/themes/heirloom/css/tabbed-pane/tabbed-pane.css");-->  */
 
 
 body {
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-index.css b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-index.css
index 74c5d3a59..c398a3e27 100644
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-index.css
+++ b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-index.css
@@ -1,7 +1,7 @@
 @import url("css/main.css");
 /* Chris presumably forgot the ! to comment the following 2 lines out
-/* <--@import url("/css/acs-master.css");-->   */
-/* <--@import url("/css/tabbed-pane/tabbed-pane.css");-->  */
+/* <--@import url("/themes/heirloom/css/acs-master.css");-->   */
+/* <--@import url("/themes/heirloom/css/tabbed-pane/tabbed-pane.css");-->  */
 
 
 body {
diff --git a/ccm-shortcuts/web/themes/heirloom/apps/shortcuts/xsl/index.xsl b/ccm-shortcuts/web/themes/heirloom/apps/shortcuts/xsl/index.xsl
index d754c48c5..70e20f706 100755
--- a/ccm-shortcuts/web/themes/heirloom/apps/shortcuts/xsl/index.xsl
+++ b/ccm-shortcuts/web/themes/heirloom/apps/shortcuts/xsl/index.xsl
@@ -4,10 +4,6 @@
         xmlns:shortcuts="http://www.arsdigita.com/shortcuts/1.0"
         xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
 
- <!-- IMPORT DEFINITIONS ccm-shortcuts installed as separate web application
-  <xsl:import href="../../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../../../ROOT/packages/ui/xsl/ui.xsl"/>
- -->
 
  <!-- IMPORT DEFINITIONS ccm-ldn-shortcuts installed into the main CCM webapp
  -->
diff --git a/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/index.xsl b/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/index.xsl
index 89ca10d89..0a07ab1a8 100755
--- a/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/index.xsl
+++ b/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/index.xsl
@@ -5,8 +5,8 @@
                    version="1.0">
 
   <!-- IMPORT DEFINITIONS ccm-ldn-theme 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/themes/heirloom/packages/bebop/xsl/bebop.xsl"/>
+  <xsl:import href="../../../../../ROOT/themes/heirloom/packages/ui/xsl/ui.xsl"/>
   -->
   <!-- IMPORT DEFINITIONS ccm-themedirector installed into the main CCM webapp
   -->