diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
index 8fec63c6c..7247a961f 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
@@ -1,5 +1,7 @@
 # ##############################################################################
-# Scientific CMS devel bundle integration.properties, version 2.0.x
+# ScientificCMS devel bundle integration.properties, version 2.3.x
+# Main purpose is to ensure compatibility among all CCM packages and to provide
+# Add On packages.
 # ##############################################################################
 #
 #
@@ -91,7 +93,7 @@ waf.xml.activate_full_date_formatter=true
 ; For new installations and Foundry default theme
 waf.xml.xsl_transformer=saxonhe
 ; For updates and existing Mandalay based themes:
-
+#waf.xml.xsl_transformer=
 
 
 # CMS configuration parameters
@@ -115,7 +117,7 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatch
 ; configuration, default is:
 ; com.arsdigita.cms.dhtml_editor_config=Xinha.Config,/assets/xinha/CCMcmsXinhaConfig.js
 
-; to use FCKeditor:
+; to use CKeditor:
 ; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
 ; com.arsdigita.cms.dhtml_editor_hidden_buttons=
 ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
@@ -149,13 +151,13 @@ com.arsdigita.cms.contenttypes.event.hide_event_type=true
 com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
 com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
 com.arsdigita.cms.contenttypes.event.use_html_date_description=false
-com.arsdigita.cms.contenttypes.event.start_year=2000
+com.arsdigita.cms.contenttypes.event.start_year=2015
 com.arsdigita.cms.contenttypes.event.end_year_delta=5
 
 
 # ccm-cms-types-newsitem parameters
 com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
-com.arsdigita.cms.contenttypes.newsitem.start_year=2000
+com.arsdigita.cms.contenttypes.newsitem.start_year=2015
 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
@@ -182,6 +184,7 @@ com.arsdigita.navigation.category_menu_show_grand_children=false
 ; com.arsdigita.navigation.category_menu_show_nephews=false
 com.arsdigita.navigation.default_cat_root_path=/navigation/
 com.arsdigita.navigation.default_template=/templates/ccm-navigation/navigation/sci-default.jsp
+; uncomment the following line and edit the file to use a custom set of templates.
 com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
 
 
diff --git a/ccm-sci-bundle/bundles/devel/cfg/project.xml b/ccm-sci-bundle/bundles/devel/cfg/project.xml
index a2d6542b1..7ccc38e41 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/devel/cfg/project.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!--  project.xml SCI devel - containing only modules used for 
-                              ScientificCMS  development                     -->
+<!-- ======================================================================
+     project.xml - SciCMS DEVEL - containing all modules of the current SciCMS 
+     repository. It is specifically for developers to help them to make 
+     every module deployable and to create the distribution. 
+     It is NOT a production grade bundle!
+     ======================================================================= -->
 
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
@@ -9,7 +13,7 @@
                     name="ScientificCMS" 
               prettyName="Scientific CMS" 
                  version="2.3.0" 
-                 release="devel-SNAPSHOT-r3925" 
+                 release="devel-SNAPSHOT-r4767" 
                   webxml="sci-web.xml" 
               portletxml="sci-portlet.xml" 
                   webapp="ROOT" 
diff --git a/ccm-sci-bundle/src/WEB-INF/resources/scientificCMS-stylesheet-paths.txt b/ccm-sci-bundle/src/WEB-INF/resources/scientificCMS-stylesheet-paths.txt
index 952659be4..02ca455a7 100644
--- a/ccm-sci-bundle/src/WEB-INF/resources/scientificCMS-stylesheet-paths.txt
+++ b/ccm-sci-bundle/src/WEB-INF/resources/scientificCMS-stylesheet-paths.txt
@@ -11,16 +11,23 @@
 # webapp tag is redundant, but sort of required by some part of the code.
 
 
-# Theme with single entry point (e.g Mandalay) managed by themedirector
+# Theme with single entry point (e.g Foundry) managed by themedirector
 #http://::host::/resource/::webapp::/themes/::themedir::/::theme::/start.xsl
 http://::host::/::webapp::/themes/::themedir::/::theme::/start.xsl
 
-# Theme with single entry point (e.g Mandalay) unmanaged default
-#http://::host::/resource/::webapp::/themes/mandalay/start.xsl
-#http://::host::/::webapp::/themes/mandalay/start.xsl
+# Theme with single entry point (e.g Foundry) unmanaged default
+# Optional customer specific default. If empty scicms-default is used.
+#http://::host::/resource/::webapp::/themes/scicms-custom/start.xsl
+http://::host::/::webapp::/themes/scicms-custom/start.xsl
 
-# Theme with single entry point (e.g Mandalay) unmanaged default
-#http://::host::/resource/::webapp::/themes/mandalay/start.xsl
+# Theme with single entry point (e.g Foundry) unmanaged default
+# Optional distribution specific default. If empty foundry-base is used.
+#http://::host::/resource/::webapp::/themes/scicms-default/start.xsl
+http://::host::/::webapp::/themes/scicms-default/start.xsl
+
+# Theme with single entry point (e.g Foundry) unmanaged default
+# Fall back if anything else fails.
+#http://::host::/resource/::webapp::/themes/foundry-base/start.xsl
 http://::host::/::webapp::/themes/foundry-base/start.xsl
 
 
diff --git a/ccm-sci-bundle/web/themes/scicms-default/aREADME.scicms-default b/ccm-sci-bundle/web/themes/scicms-default/aREADME.scicms-default
index b7bf50d1f..b0b4b938d 100644
--- a/ccm-sci-bundle/web/themes/scicms-default/aREADME.scicms-default
+++ b/ccm-sci-bundle/web/themes/scicms-default/aREADME.scicms-default
@@ -1,4 +1,4 @@
-ScientificCMS bundle default unmanaged theme (with single entry point as of
+ ScientificCMS bundle default unmanaged theme (with single entry point as of
 Foundry).
 It is used if there is no managed theme (managed by themedirector) configured 
 (or if themedirector is not installed) and no custom theme (see scicms-custom)
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/admin-index.css b/ccm-sci-bundle/web/themes/static/aplaws-generic/admin-index.css
deleted file mode 100644
index 48adbe063..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/admin-index.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url(../../heirloom/css/acs-master.css);
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/admin-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/admin-index.xsl
deleted file mode 100644
index 86bc861d2..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/admin-index.xsl
+++ /dev/null
@@ -1,18 +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="../../../../ROOT/themes/heirloom/apps/admin/xsl/index.xsl"/>
-  -->
-  <xsl:import href="../../heirloom/apps/admin/xsl/index.xsl"/>
-  <xsl:import href="lib/page.xsl"/>
-
-  <xsl:param name="theme-prefix"/>
-
-  <xsl:template name="aplaws:headerStyleSheets">
-    <link rel="stylesheet" href="{$theme-prefix}/admin-index.css" type="text/css" media="screen"/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-admin.css.NotUsedForNow b/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-admin.css.NotUsedForNow
deleted file mode 100644
index 54c8c5bc3..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-admin.css.NotUsedForNow
+++ /dev/null
@@ -1,2 +0,0 @@
-@import url("/css/acs-master.css");
-@import url("/__ccm__/static/atoz/atoz.css");
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-admin.xsl.NotUsedForNow b/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-admin.xsl.NotUsedForNow
deleted file mode 100644
index f93dc8a51..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-admin.xsl.NotUsedForNow
+++ /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">
-
-  <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application
-  <xsl:import href="../../../../ccm-ldn-atoz/themes/heirloom/apps/atoz/xsl/index.xsl"/>
-  -->
-  <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed into the main CCM webapp
-  -->
-  <xsl:import href="../../../themes/heirloom/apps/atoz/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}/atoz-index.css" type="text/css" media="screen"/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-index.css.NotUsedForNow b/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-index.css.NotUsedForNow
deleted file mode 100644
index 54c8c5bc3..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-index.css.NotUsedForNow
+++ /dev/null
@@ -1,2 +0,0 @@
-@import url("/css/acs-master.css");
-@import url("/__ccm__/static/atoz/atoz.css");
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow b/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow
deleted file mode 100644
index 5b4d689da..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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/navigation"
-  xmlns:search="http://rhea.redhat.com/search/1.0"
-  xmlns:atoz="http://xmlns.redhat.com/atoz/1.0"
-  exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz"
-  version="1.0">
-
-  <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application
-<xsl:import href="../../../../ROOT/themes/heirloom/apps/content-section/xsl/index.xsl"/>
-  -->
-
-  <!-- IMPORT DEFINITIONS ccm-ldn-atoz  installed into the main CCM webapp
-  -->
-  <xsl:import href="../../../themes/heirloom/apps/content-section/xsl/index.xsl"/>
-	
-<xsl:import href="lib/header.xsl"/>
-<xsl:import href="lib/lib.xsl"/>
-<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
-   
-<xsl:param name="context-prefix"></xsl:param>
-<xsl:param name="dispatcher-prefix" />
-<xsl:param name="theme-prefix" />
-
-<xsl:output 
-	method="html"
-	doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
-	doctype-system="http://www.w3.org/TR/html4/loose.dtd"
-	indent="yes" 
-/> 
-	
-<xsl:template match="bebop:page[@application='atoz']">
-<html lang="en">
-	<head>
-		<title>APLAWS+: A to Z</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="azBreadcrumb"/>
-		<xsl:call-template name="azBody"/>
-  </body>
-</html>
-</xsl:template>
-
-
-
-
-<xsl:template name="azBody">
-<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="azNav" />
-		</td>
-    <td colspan="2" align="left" valign="top" id="title">
-		<!--MAIN CONTENT -->
-		<h1>A to Z List</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="azMain" />	
-	</td>
-	<td width="20%" height="400" align="left" valign="top" id="RHS">
-  </td>
-</tr>
-</table>
-<xsl:call-template name="footer"/>
-</xsl:template>
-
-
-
-
-
-
-
-
-<xsl:template name="azBreadcrumb">
-<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">A to Z</span>
-</p>
-</div>
-</xsl:template>
-
-
-
-
-<xsl:template name="azNav">
-<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>
-<div class="navHere"><p>A to Z</p></div>
-<a href="/atozhelp" class="navChild" title="A to Z explained" >A to Z explained</a><span class="hide">|</span>
-</div>
-</xsl:template>
-
-
-<xsl:template name="azMain">
-<a class="navHide" href="#startAZResults" title="Go directly to A-Z results">Skip to A-Z results</a>
-<xsl:for-each select="atoz:atoz">
-	<div id="azSub">Browse the alphabetically listed information and services below</div>
-	<div id="azArea">
-	<div id="azInfo">
-	<xsl:for-each select="atoz:letter">
-	<a>
-	<xsl:attribute name="href">?letter=<xsl:value-of select="." /></xsl:attribute>
-	<xsl:value-of select="." /></a>
-	<xsl:if test="position()!='last'"> | </xsl:if>
-	</xsl:for-each>
-	</div>
-	<div id="azPlace">Categories starting with the letter <span class="letterSelected"><xsl:value-of select="atoz:letter[@isSelected]" /></span></div>
-</div>
-<a id="startAZResults" title="Start of A-Z results"></a>
-<xsl:call-template name="azResults" />
-</xsl:for-each>
-</xsl:template>
-
-
-
-
-
-
-<xsl:template name="azResults">
-<xsl:for-each select="./atoz:provider">
-<div id="azList">
-	<h2><xsl:value-of select="@title" /><span class="azTitleDescription"><xsl:text>[</xsl:text><xsl:value-of select="@description" /><xsl:text>]</xsl:text></span></h2>
-	<xsl:for-each select="atoz:atomicEntry">
-	<div class="azResult">
-	<a href="{@url}" title="{@description}"><xsl:value-of select="@title" /></a>
-	</div>
-	</xsl:for-each>
-</div>
-</xsl:for-each>
-</xsl:template>
-
-
-
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/category-step.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/category-step.xsl
deleted file mode 100644
index 8780861e0..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/category-step.xsl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                  xmlns:ui="http://www.arsdigita.com/ui/1.0"
-              xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-   exclude-result-prefixes="bebop cms ui aplaws xsl"
-                   version="1.0">
-
-  <xsl:import href="../../heirloom/packages/cms/xsl/admin/category-step/category-step.xsl"/>
-  
-  <xsl:param name="theme-prefix" />
-
-  <xsl:template match="cms:emptyPage[@title='childCategories']">
-    <xsl:choose>
-      <xsl:when test="cms:category/@order='sortKey'">
-    <xsl:apply-templates select="cms:category/cms:category" mode="cms:javascriptCat">
-      <xsl:with-param name="expand" select="'none'"/>
-          <xsl:sort data-type="number" select="@sortKey"/>
-    </xsl:apply-templates>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="cms:category/cms:category" mode="cms:javascriptCat">
-          <xsl:sort data-type="text" select="@name"/>
-          <xsl:with-param name="expand" select="'none'"/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-    
-  </xsl:template>
-
-  <xsl:template match="cms:emptyPage[@title='autoCategories']">
-    <xsl:choose>
-      <xsl:when test="cms:category/@order='sortKey'">
-        <xsl:apply-templates select="cms:category" mode="cms:javascriptCat" >
-        <xsl:with-param name="expand" select="'none'"/>
-          <xsl:sort data-type="number" select="@sortKey"/>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="cms:category" mode="cms:javascriptCat" >
-          <xsl:sort data-type="text" select="@name"/>
-          <xsl:with-param name="expand" select="'none'"/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-    
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/consultations-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/consultations-index.xsl
deleted file mode 100644
index 1e4b542ca..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/consultations-index.xsl
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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/navigation"
-  version="1.0">
-
-<!--
-  <xsl:import href="../../themes/aplaws-generic/navigation-index.xsl"/>
-  -->
-  <xsl:import href="navigation-index.xsl"/>
-  
-  <xsl:template name="pageContent">
-    <a class="intLink" name="top" />
-    <xsl:call-template name="greeting" />
-    <xsl:call-template name="contentLinks" />
-    <xsl:call-template name="dimensionalNavbars" />
-    <xsl:call-template name="dataTables" />
-    <xsl:call-template name="boxPanels1" />
-    <xsl:call-template name="forms" />
-    <xsl:call-template name="labels" />
-  </xsl:template>
-
-  <!-- Copied from ccm-core/web/packages/bebop/xsl/DataTable.xsl -->
-  <xsl:template name="dataTables">
-    <xsl:for-each select="bebop:table[@class='dataTable']">
-      <table cellpadding="1" cellspacing="2" border="0">
-        <xsl:for-each select="thead|bebop:thead"> 
-          <xsl:call-template name="dataTableHead">
-            <xsl:with-param name="orderColumn" select="../@order"/>
-            <xsl:with-param name="direction" select="../@direction"/> 
-          </xsl:call-template>
-        </xsl:for-each>
-        <xsl:for-each select="bebop:tbody">
-          <xsl:call-template name="dataTableBody"/>
-        </xsl:for-each>
-      </table>
-    </xsl:for-each>
-  </xsl:template>
-
-  <!-- Copied from ccm-core/web/packages/bebop/xsl/BoxPanel.xsl -->
-  <xsl:template name="boxPanels1">
-    <xsl:for-each select="bebop:boxPanel[@axis='1']">
-      <table>
-        <xsl:if test="string-length(@width)>0">
-          <xsl:attribute name="width">
-            <xsl:value-of select="@width"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:if test="string-length(@border)>0">
-          <xsl:attribute name="border">
-            <xsl:value-of select="@border"/>
-          </xsl:attribute>
-        </xsl:if>
-        <tr>
-          <xsl:for-each select="bebop:cell">
-            <td>
-              <xsl:for-each select="*/@class|*/@style">
-                <xsl:attribute name="{name()}">
-                  <xsl:value-of select="." />
-                </xsl:attribute>
-              </xsl:for-each>
-              <xsl:apply-templates/>
-            </td>
-          </xsl:for-each>
-        </tr>
-      </table>  
-    </xsl:for-each>
-  </xsl:template>
-
-  <!-- Copied from ccm-core/web/packages/bebop/xsl/DimensionalNavbar.xsl -->
-  <xsl:template name="dimensionalNavbars">
-    <xsl:for-each select="bebop:dimensionalNavbar">
-      <xsl:comment>bebop:dimensionalNavbar</xsl:comment>
-      <xsl:value-of select="@startTag"/>
-      <xsl:for-each select="*">
-        <xsl:apply-templates select="."/>
-        <xsl:if test="position()!=last()">
-          <xsl:choose>
-            <xsl:when test="string-length(../@delimiter)=0">
-              &#160;&gt;&#160;
-            </xsl:when>
-            <xsl:otherwise><xsl:value-of select="../@delimiter"/></xsl:otherwise>
-          </xsl:choose>
-        </xsl:if>
-      </xsl:for-each>
-      <xsl:value-of select="@endTag"/>
-      <xsl:comment>/bebop:dimensionalNavbar</xsl:comment>
-    </xsl:for-each>
-  </xsl:template>
-
-  <!-- Copied from ccm-core/web/packages/bebop/xsl/Form.xsl -->
-  <xsl:template name="forms">
-    <xsl:for-each select="bebop:form">
-      <xsl:value-of select="@message"/>
-      <form>
-        <xsl:for-each select="@*[not(self::method)]">
-          <xsl:attribute name="{name()}">
-            <xsl:value-of select="."/>
-          </xsl:attribute>
-          <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:for-each>
-        <xsl:apply-templates />
-      </form>
-    </xsl:for-each>
-  </xsl:template>
-
-  <!-- Copied from ccm-core/web/packages/bebop/xsl/Label.xsl -->
-  <xsl:template name="labels">
-    <xsl:for-each select="bebop:label">
-      <xsl:call-template name="bebop-label-text">
-         <xsl:with-param name="text" select="text()"/>
-         <xsl:with-param name="escape" select="@escape"/>
-      </xsl:call-template>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:output method="html"/>
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/content-center-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/content-center-index.xsl
deleted file mode 100644
index c2d313f50..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/content-center-index.xsl
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                  xmlns:ui="http://www.arsdigita.com/ui/1.0"
-              xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-   exclude-result-prefixes="bebop cms ui aplaws xsl"
-                   version="1.0">
-
-  <xsl:import href="../../heirloom/apps/content-center/xsl/index.xsl"/>
-  <xsl:import href="../../heirloom/packages/bebop/xsl/dcp.xsl"/>
-
-  <xsl:param name="theme-prefix" />
-  <xsl:param name="internal-theme" />
-
-  <xsl:variable name="here"><xsl:value-of select="$internal-theme"/>/packages/cms/xsl/admin/page</xsl:variable>
-
-
-  <xsl:template match="bebop:page[@class = 'cms-admin']">
-    <html xmlns:deditor="http://www.arsdigita.com/deditor/1.0">
-      <head>
-        <title><xsl:value-of select="bebop:title"/></title>
-        <link rel="stylesheet" type="text/css" href="{$internal-theme}/css/acs-master.css"/>
-        <link rel="stylesheet" type="text/css" 
-              href="{$internal-theme}/packages/cms/xsl/admin/cms-admin.css"/>
-      </head>
-      <body>
-        <xsl:call-template name="bebop:dcpJavascript"/>
-        <table id="global-header">
-          <tr>
-            <td id="logo"><img src="{$theme-prefix}/images/aplaws-logo-small.png" 
-                               height="30" width="30"/>
-            </td>
-            <td id="context"><xsl:apply-templates select="bebop:contextBar"/></td>
-            <td style="margin: 0; color: #3f3f3f; border: 0; padding: 0; padding-right: 18px;">Welcome <strong><xsl:value-of select="@name" /></strong></td>
-            <td>
-              <table id="global-links">
-                <tr>
-                  <td class="global-link-icon">
-                      <a href="{cms:globalNavigation/cms:workspace/@href}">
-                          <img src="{$internal-theme}/images/home.png" 
-                               height="18" width="18"/>
-                      </a>
-                  </td>
-                  <td class="global-link">
-                      <a href="{cms:globalNavigation/cms:workspace/@href}">Home</a>
-                  </td>
-
-                  <td class="global-link-icon">
-                      <a href="{cms:globalNavigation/cms:signOut/@href}">
-                          <img src="{$internal-theme}/images/lock.png" 
-                               height="18" width="14"/>
-                      </a>
-                  </td>
-                  <td class="global-link">
-                      <a href="{cms:globalNavigation/cms:signOut/@href}">Logout</a>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-        </table>
-        <div id="page-title"><xsl:value-of select="bebop:title"/></div>
-        <xsl:if test="bebop:link[@id = 'preview_link']">
-          <xsl:choose>
-            <xsl:when test="bebop:link[@target]">
-              <div style="float: right; margin-right: 12px"><a target="{bebop:link/@target}" href="{bebop:link[@id = 'preview_link']/@href}"><xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/></a></div>
-            </xsl:when>
-            <xsl:otherwise>
-              <div style="float: right; margin-right: 12px"><a href="{bebop:link[@id = 'preview_link']/@href}"><xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/></a></div>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:if>
-        <div><xsl:apply-templates select="*[@id = 'page-body']"/></div>
-        <xsl:choose>
-          <xsl:when test="bebop:structure">
-            <div><xsl:apply-templates select="bebop:structure"/></div>
-          </xsl:when>
-          <xsl:when test="ui:debugPanel">
-            <div><xsl:apply-templates select="ui:debugPanel"/></div>
-          </xsl:when>
-        </xsl:choose>
-      </body>
-    </html>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/content-section-admin.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/content-section-admin.xsl
deleted file mode 100644
index 70dc7223f..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/content-section-admin.xsl
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                  xmlns:ui="http://www.arsdigita.com/ui/1.0"
-              xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-   exclude-result-prefixes="bebop cms ui aplaws xsl"
-                   version="1.0">
-
-  <xsl:import href="../../heirloom/apps/content-section/xsl/content-admin.xsl"/>
-  <xsl:import href="../../heirloom/packages/bebop/xsl/dcp.xsl"/>
-
-  <xsl:import href="category-step.xsl"/>
-  
-  <xsl:param name="theme-prefix" />
-  <xsl:param name="internal-theme" />
-
-  <xsl:variable name="here"><xsl:value-of select="$internal-theme"/>/packages/cms/xml/admin/page</xsl:variable>
-
-  <xsl:template name="cat-widget-cat-name">
-    <xsl:value-of select="@name"/>
-
-    <xsl:if test="@pid and @domain='LGSL'">
-        (<xsl:value-of select="@pid"/>)
-    </xsl:if>
-  </xsl:template>
-
-
-  <xsl:template match="bebop:page[@class = 'cms-admin']">
-    <html xmlns:deditor="http://www.arsdigita.com/deditor/1.0">
-      <head>
-        <title><xsl:value-of select="bebop:title"/></title>
-        <link rel="stylesheet" type="text/css" href="{$internal-theme}/css/acs-master.css"/>
-        <link rel="stylesheet" type="text/css" href="{$internal-theme}/packages/cms/xsl/admin/cms-admin.css"/>
-      </head>
-      <body>
-        <xsl:call-template name="bebop:dcpJavascript"/>
-        <table id="global-header">
-          <tr>
-            <td id="logo"><img src="{$theme-prefix}/images/aplaws-logo-small.png" height="30" width="30"/></td>
-            <td id="context"><xsl:apply-templates select="bebop:contextBar"/></td>
-            <td style="margin: 0; color: #3f3f3f; border: 0; padding: 0; padding-right: 18px;">Welcome <strong><xsl:value-of select="@name" /></strong></td>
-            <td>
-              <table id="global-links">
-                <tr>
-                  <td class="global-link-icon"><a href="{cms:globalNavigation/cms:workspace/@href}"><img src="{$internal-theme}/images/home.png" height="18" width="18"/></a></td>
-                  <td class="global-link"><a href="{cms:globalNavigation/cms:workspace/@href}">Home</a></td>
-
-                  <td class="global-link-icon"><a href="{cms:globalNavigation/cms:signOut/@href}"><img src="{$internal-theme}/images/lock.png" height="18" width="14"/></a></td>
-                  <td class="global-link"><a href="{cms:globalNavigation/cms:signOut/@href}">Logout</a></td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-        </table>
-        <div id="page-title"><xsl:value-of select="bebop:title"/></div>
-        <xsl:if test="bebop:link[@id = 'preview_link']">
-          <xsl:choose>
-            <xsl:when test="bebop:link[@target]">
-              <div style="float: right; margin-right: 12px"><a target="{bebop:link/@target}" href="{bebop:link[@id = 'preview_link']/@href}"><xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/></a></div>
-            </xsl:when>
-            <xsl:otherwise>
-              <div style="float: right; margin-right: 12px"><a href="{bebop:link[@id = 'preview_link']/@href}"><xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/></a></div>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:if>
-        <div><xsl:apply-templates select="*[@id = 'page-body']"/></div>
-        <xsl:choose>
-          <xsl:when test="bebop:structure">
-            <div><xsl:apply-templates select="bebop:structure"/></div>
-          </xsl:when>
-          <xsl:when test="ui:debugPanel">
-            <div><xsl:apply-templates select="ui:debugPanel"/></div>            
-          </xsl:when>
-        </xsl:choose>
-      </body>
-    </html>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/content-section-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/content-section-index.xsl
deleted file mode 100644
index 4d95074da..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/content-section-index.xsl
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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/navigation"
-  exclude-result-prefixes="xsl bebop aplaws ui cms nav"
-  version="1.0">
-
-<xsl:import href="../../heirloom/apps/content-section/xsl/index.xsl"/>
-<xsl:import href="lib/header.xsl"/>
-<xsl:import href="lib/lib.xsl"/>
-<xsl:import href="lib/leftNav.xsl"/>
-<xsl:import href="types/ContentTypes.xsl"/>
-<xsl:import href="../../heirloom/packages/bebop/xsl/dcp.xsl"/>
-
-<xsl:param name="context-prefix"/>
-<xsl:param name="dispatcher-prefix"/>
-
-<xsl:output 
-	method="html"
-	doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
-	doctype-system="http://www.w3.org/TR/html4/loose.dtd"
-	indent="yes" 
-/>
-
- 
-
-
-<xsl:template match="bebop:page[@class='simplePage']">
-<html lang="en">
-	<head>
-		<xsl:call-template name="metaData"/>
-		<title>APLAWS+: <xsl:call-template name="Title"/></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="breadcrumb"/>
-		<xsl:call-template name="mainContent"/>
-	</body>
-</html>
-</xsl:template>
-
-
-
-<xsl:template name="mainContent">
-    
-<!--MAIN LAYOUT -->
-
-<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="leftNav" />
-    </td>
-    <td colspan="2" align="left" valign="top" id="title">
-<!--MAIN CONTENT -->
-		<h1><xsl:call-template name="Title" /></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="pageContent" />	
-	</td>
-	<td width="20%" height="400" align="left" valign="top" id="RHS">
-		<div id="related">
-		<xsl:call-template name="relatedItems" />
-		</div>
-    </td>
-  </tr>
-</table>
-
-
-
-
-<xsl:call-template name="footer"/>
-
-
-</xsl:template>
-
-</xsl:stylesheet>
-
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/css/main.css b/ccm-sci-bundle/web/themes/static/aplaws-generic/css/main.css
deleted file mode 100644
index 8ba53c820..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/css/main.css
+++ /dev/null
@@ -1,1066 +0,0 @@
-/* Uncomment to debug box model */
-/*
-* {
-  border: 1px solid black !important;
-  margin: 2px !important;
-  padding: 2px !important;
-}
-*/
-
-body {
-margin: 0;
-background-color: #FFF;
-color: #000;
-font-family: Verdana, Arial, Helvetica, sans-serif; 
-}
-
-a {
-	color: #333;
-	text-decoration: underline;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-#startcontent {
-text-decoration: none !important;
-}
-
-.intLink {
-text-decoration: none !important;
-}
-
-.topLink {
-color: #69C !important;
-text-decoration: none !important;
-}
-
-
-img,a img {
-border: none;
-}
-
-.hide {display:none}
-
-.navHide {
-	position: absolute;
-	left: -1000px;
-	width: 990px;
-	font-size:1px; 
-}
-
-
-
-
-
-
-
-#header {
-clear: both;
-width: 100%;
-background-color: #036;
-margin: 0px;
-border-top: 4px solid #036;
-border-bottom: 1px solid #999;
-}
-
-#logo {
-float: left;
-margin: 0px;
-}
-
-#utils {
-float: left;
-width: 50%;
-margin: 7px 0 0 0;
-text-align: right;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #FFF;
-}
- 
-#utils a:link {
-color: #FFF; 
-text-decoration: underline;	
-}
-#utils a:visited {
-color: #FFF; 
-text-decoration: underline;
-}
-#utils a:hover {
-color: #FFF; 
-text-decoration: underline;
-}
-#utils a:active {
-color: #FFF; 
-text-decoration: underline;
-}
-
-#search {
-float: right;
-text-align: right;
-margin: 0px 10px 0 0;
-font-weight: bold; 
-color: #000;
-background-color: #999;
-border-top: 3px solid #999;
-border-bottom: 3px solid #999;
-}
-
-#search form {
-margin: 0;
-}
-
-#search label {
-display: none;
-position: absolute;
-}
-
-.searchBox {  
-font-size: 0.7em; 
-font-weight: normal;
-margin-left: 20px;
-}
-
-.go {  
-font-size: 0.7em; 
-font-weight: normal; 
-margin-right: 10px;
-padding: 0px;
-}
-
-#clear {
-  clear: both;
-}
-
-#tlcNav  {  
-clear: both;
-position: relative;
-width: 100%;
-font-size: 0.6em; 
-font-weight: normal; 
-color: #666; 
-background-color: #CCC;
-border-top: 1px solid #9CF;
-border-bottom: 1px solid #9CF;
-text-transform: uppercase;
-}
-
-#tlcNav p{  
-margin: 0 2px 0 3px;
-}
-
-
-#tlcNav a{  
-color: #036;
-text-transform: uppercase;
-text-decoration: none;
-}
-
-#tlcNav a:hover{  
-color: #FFF;
-text-transform: uppercase;
-text-decoration: underline;
-}
-
-#bread {  
-clear: both;
-position: relative;
-width: 100%;
-font-size: 0.7em; 
-border-top: 1px solid #036; 
-border-bottom: 1px solid #333;
-background-color: #EEE;
-text-transform: lowercase;
-}
-
-#bread p {  
-margin: 1px 0 1px 3px;
-}
-
-#bread a {  
-color: #333 !important;
-text-decoration: none;
-}
-
-#bread a:hover {  
-color: #000;
-text-decoration: underline;
-}
-
-#LHS{
-text-transform: capitalize;
-}
-
-#nav{
-padding-top: 1em;
-margin: 0 0 0px 2px;
-}
-
-.navUp {  
-margin-top: 5px;
-font-size: 0.7em; 
-border-bottom: 1px solid #333;
-}
-
-.navUp a{  
-text-decoration: none;
-} 
-
-.navHere {  
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000;
-background-color: #CCC;
-border-bottom: 1px solid #333;
-}
-
-.navHere p {  
-margin: 0 0 0 1.4em;
-}
-
-.navHere a {  
-text-decoration: none;
-}
-
-.navChild {  
-display: block;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-margin: 0.2em 0 0.2em 1.4em;
-border-bottom: 1px solid #9CF;
-text-decoration: none;
-}
-
-.navChild:hover {  
-background-color: #DDD; 
-text-decoration: none;
-}
-
-#title {
-padding-top: 1em;
-}
-
-#title h1{
-font-size: 0.7em;
-font-weight: bold;
-margin: 5px 0  0 15px;
-border-bottom: 1px solid #CCC;
-}
-
-#greeting {
-margin: 1em 1em 2em 15px;
-}
-
-#greeting img{
-margin: 0 0 0 1em;
-} 
-
-#greeting   {  
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-}
-
-#greeting  ul{  
-list-style: square;
-margin-left: 15px;
-font-size: 1em; 
-font-weight: normal; 
-color: #000; 
-}
-
-#contentLinks{
-clear: both;
-position: relative;
-margin: 1em 1em 2em 15px;
-border-bottom: 20px solid #FFF;
-}
-
-#contentLinks a {  
-display: block;
-font-size: 0.7em; 
-font-weight: normal; 
-padding: 0.2em 0 0.2em 0;
-color: #000; 
-text-decoration: underline;
-}
-
-#contentLinks a:hover {  
-text-decoration: underline;
-}
-
-#lead {
-font-weight: bold;
-}
-
-#leadDetails {
-font-weight: normal;
-}
-
-#leadDetails .bold {
-display: block;
-font-weight: bold;
-}
-
-#details {
-clear: both;
-position: relative;
-margin: 2em 1em 2em 15px;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000;
-}
-
-#details p{
-margin: 0 0 0.3em 0;
-}
-
-#details .bold{
-padding: 0 0.5em 0 0;
-font-weight:bold;
-}
-
-#newsDate {
-text-align: right;
-}
-
-.caption {
-text-align: right;
-}
-
-#R_image {
-float: right;
-margin: 0 0 1em 2em;
-padding: 0 0 0 0.8em;
-text-align: left;	
-}
-
-#mainBody {
-clear: both;
-position: relative;
-margin: 2em 1em 2em 15px;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000;
-}
-
-#mainBody ul {  
-list-style: square;
-margin-left: 15px;
-font-size: 1em; 
-font-weight: normal; 
-color: #000; 
-}
-
-#mainBody ol {  
-list-style: decimal;
-margin-left: 22px;
-font-size: 1em; 
-font-weight: normal; 
-color: #000; 
-}
-
-#mainBody .bold {
-font-weight: bold;
-}
-
-.attachment {
-clear: both;
-position: relative;
-margin: 2em 1em 2em 15px;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000;
-}
-
-.attachment h2{
-font-size: 1em;
-font-weight: bold;
-border-bottom: 1px solid #CCC;
-}
-
-.attachment ul {  
-list-style: square;
-margin-left: 15px;
-font-size: 1em; 
-font-weight: normal; 
-color: #000; 
-}
-
-#sectionList {
-clear: both;
-position: relative;
-margin: 1em 1em 2em 15px;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-}
-
-#sectionList .bold {
-display: block;
-font-weight: bold;
-}
-
-#sectionList a {
-color: #69C;
-}
-
-.section {
-clear: both;
-position: relative;
-margin: 1em 1em 2em 15px;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-}
-
-.section img{
-margin: 0 0 0 1em;
-} 
-
-.section ul {  
-list-style: square;
-margin-left: 15px;
-font-size: 1em; 
-font-weight: normal; 
-color: #000; 
-}
-
-.section ol {  
-list-style: decimal;
-margin-left: 22px;
-font-size: 1em; 
-font-weight: normal; 
-color: #000; 
-}
-
-.section .bold {
-float: left;
-display: block;
-font-weight: bold;
-font-size: 1em; 
-color: #000; 
-}
-
-#mpaDirection {
-clear: both;
-position: relative;
-margin: 1em 1em 2em 15px;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-}
-
-#mpaDirection a {
-color: #000; 
-font-weight: bold; 
-text-decoration: none;
-}
-
-#related{
-margin: 1em 2px 0 0;
-border-left: 1px solid #9CF;
-}
-
-#related h2{
-font-size: 0.7em; 
-font-weight: bold; 
-padding-left: 1em;
-}
-
-#related a {  
-display: block;
-width: 100%;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-padding: 0.2em 0 0.2em 1.1em;
-text-decoration: none;
-}
-
-#related a:hover {  
-text-decoration: underline;
-}
-
-#footer {
-text-align: center;
-border-top: 1px solid #036;
-padding-top: 0.3em;
-}
-
-#foottlc {
-font-size: 0.7em; 
-font-weight: normal; 
-color: #333; 
-margin: 0 10%;
-}
-
-#foottlc a{
-color: #333;
-text-transform: lowercase;
-}
-
-#legal {
-border-top: 1px solid #999;
-font-size: 0.65em; 
-font-weight: normal; 
-color: #666; 
-margin: 1em 0 0 0;}
-
-#legal a{
-color: #666; 
-}
-
-#compliance{
-}
-
-#compliance a {  
-}
-
-#compliance img {  
-border: 0;
-}
-
-#searchArea {
-clear: both;
-position: relative;
-margin: 1em 1em 2em 15px;
-background-color: #CCC;
-color: #333;
-}
-
-.searchLabel {
-position: absolute;
-left: -1000px;
-width: 990px;
-font-size:1px; 
-}
-
-
-
-
-
-.searchExplanation {
-margin: 1em 0 2em 3px;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-border-top: 1px solid #999;
-}
-
-#advGo {
-text-align: right;
-border-top: 1px solid #9CF;
-}
-
-.adgo {  
-font-size: 0.7em; 
-font-weight: normal; 
-height: 1.6em;
-background-color: #9CF;
-}
-
-.searchAgain {
-padding-left: 0.3em;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-}
-
-#resultsInfo {
-clear: both;
-position: relative;
-margin: 1em 0 1em 0.3em;
-border-bottom: 1px solid #FFF;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-}
-
-#resultsList {
-clear: both;
-position: relative;
-margin: 1em 1em 2em 15px;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-border-bottom: 20px solid #FFF;
-}
-
-.searchResult {
-clear: both;
-position: relative;
-margin: 1em 0 1em 0;
-font-weight: normal; 
-color: #000 !important; 
-}
-
-.searchResult a{
-display: block;
-font-weight: bold; 
-color: #333; 
-}
-
-#resultsPage {
-clear: both;
-position: relative;
-margin: 1em 1em 2em 15px;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-border-top: 1px solid #CCC;
-}
-
-#pLeft {
-float: left;
-text-align: left;
-border-top: 1px solid #CCC;
-margin-top: -1px;
-}
-
-#pRight {
-float: right;
-text-align: right;
-border-top: 1px solid #CCC;
-margin-top: -1px;
-}
-
-#resultsPage a {
-color: #333; 
-}
-
-.searchFilter {
-margin: 0;
-color: #333;
-font-size: 0.7em;
-}
-
-#advancedS {
-width: 255px !important;
-margin-top: 8px;
-font-size: 0.7em;
-border: 1px solid #666;
-}
-
-#advlisthead {
-color: #FFF;
-background-color: #9CF;
-}
-
-#remoteS {
-width: 255px !important;
-margin-top: 8px;
-font-size: 0.7em;
-border: 1px solid #666;
-}
-
-#remotelisthead {
-color: #FFF;
-background-color: #9CF;
-}
-
-#sLinks{
-margin: 3em 2px 0 0;
-border-left: 1px solid #333;
-}
-
-#sLinks h2{
-color: #000;
-font-size: 0.7em; 
-font-weight: bold; 
-padding-left: 1em;
-}
-
-.sLink {  
-width: 100%;
-font-size: 0.7em ; 
-font-weight: normal; 
-color: #000; 
-padding: 1em 0 0.2em 1.1em;
-}
-
-.sLink a {  
-display: block;
-font-weight: bold; 
-color: #9CF !important; 
-text-decoration: none;
-}
-
-.sLink a:hover {  
-text-decoration: underline;
-}
-
-
-
-
-#azArea {
-clear: both;
-position: relative;
-margin: 1em 1em 1em 15px;
-background-color: #CCC;
-padding-bottom: 0.3em;
-}
-
-#azSub {
-clear: both;
-position: relative;
-margin: 2em 0 0 15px;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-}
-
-#azInfo {
-clear: both;
-position: relative;
-margin: 1em 0 1em 0;
-border-bottom: 1px solid #FFF;
-padding-bottom: 0.2em;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-}
-
-#azPlace {
-clear: both;
-position: relative;
-margin: 2em 0 0 0;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-}
-
-#azList {
-clear: both;
-position: relative;
-margin: 1em 1em 1em 15px;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-border-bottom: 20px solid #FFF;
-}
-
-.letterSelected {
-font-weight: bold !important;
-text-transform: uppercase; 
-}
-
-#azList h2{
-font-size: 1em; 
-}
-
-.azTitleDescription {
-font-weight: normal !important; 
-margin: 0 0 0 1em;
-}
-
-.azResult {
-clear: both;
-position: relative;
-margin: 1em 0;
-font-weight: normal; 
-color: #000 !important; 
-}
-
-.azResult a{
-display: block;
-font-weight: normal; 
-color: #333; 
-}
-
-#siteArea {
-clear: both;
-position: relative;
-margin: 1em 1em 1em 15px;
-background-color: #CCC;
-padding-bottom: 1em;
-}
-
-#siteInfo {
-clear: both;
-position: relative;
-margin: 1em 0 1em 0.3em;
-border-bottom: 1px solid #FFF;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-}
-
-#topSiteList {
-clear: both;
-position: relative;
-margin: 1em 0 0em 0.3em;
-font-size: 0.7em; 
-font-weight: bold; 
-color: #000; 
-}
-
-#topSiteList a{
-display: block;
-}
-
-.anchor {
-text-decoration: none !important;
-}
-
-#siteList {
-clear: both;
-position: relative;
-margin: 1em 1em 2em 15px;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-border-bottom: 20px solid #FFF;
-}
-
-#siteList ul {
-list-style: none;
-}
-
-.L1 {
-margin: 0 !important;
-}
-
-.L2 {
-margin: 0 !important;
-}
-
-.L3 {
-margin: 0 !important;
-}
-
-.L4 {
-margin: 0 !important;
-}
-
-.cat1 {
-margin: 1em 0 1em 0;
-border-top: 1px solid #9CF;
-}
-
-.cat1 a {
-font-weight: bold; 
-text-decoration: underline;
-}
-
-.cat1 a:hover {
-font-weight: bold; 
-text-decoration: underline !important;
-}
-
-.cat2 {
-margin: 1em 0 2em 2em;
-border-top: 1px solid #CCC;
-}
-
-.cat2 a {
-font-weight: bold; 
-text-decoration: none;
-}
-
-.cat2 a:hover {
-font-weight: bold; 
-text-decoration: underline;
-}
-
-.cat3 {
-font-weight: normal; 
-margin: 0em 0 0em 0;
-}
-
-.cat3 a {
-font-weight: bold; 
-text-decoration: none;
-}
-
-.cat4 {
-font-weight: normal; 
-margin: 0em 0 0em 2em;
-}
-
-.item {
-font-weight: normal !important; 
-padding-left: 1em;
-background-image: url("../images/arrowSitemap.gif") !important;
-background-position: 0px 5px;
-background-repeat: no-repeat;
-}
-
-.toTop {
-margin: 1em 0 5em 0;
-}
-
-#dirBox {
-clear: both;
-position: relative;
-margin: 0.5em 0 0 0 ;
-padding: 0.3em;
-border-top: 4px solid #CCC;
-}
-
-#dirBox h2 {
-font-size: 1.2em; 
-margin: 0 0 1em 0;
-}
-
-.RSS {
-padding: 0.5em 0em 0.5em 0em ;
-margin: 0;
-font-size: 1em; 
-font-weight: normal; 
-color: #000; 
-background-color: #9CF;
-}
-
-.RSS h2 {
-font-size: 1.2em; 
-margin: 0 0 1em 0;
-border-bottom: 1px solid #666;
-}
-
-.RSS a {
-display: block;
-font-weight: normal; 
-color: #333;
-}
-
-.RSS a:hover {
-color: #000;
-}
-
-#poll {
-clear: both;
-position: relative;
-margin: 0;
-padding: 0.3em;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-background-color: #CCC;
-border-top: 2px solid #666;
-border-bottom: 1px solid #9CF;
-}
-
-#poll h2 {
-font-size: 1.2em; 
-margin: 0 0 1em 0;
-border-top: 1px solid #9CF;
-}
-
-.pollQ {
-border-bottom: 1px solid #FFF;
-}
-
-.pollSend {
-border-top: 1px solid #FFF;
-text-align: right;
-font-size: 1em; 
-}
-
-.pollSend input{
-border-top: 1px solid #FFF;
-text-align: center;
-font-size: 1em; 
-}
-
-.CI {
-clear: both;
-position: relative;
-margin: 0em 0em 1em 0;
-}
-
-.CI h2 {
-font-size: 1.2em; 
-margin: 0 0 1em 0;
-}
-
-#loginBox {
-clear: both;
-position: relative;
-margin: 0 ;
-padding: 0.3em;
-font-size: 1em; 
-font-weight: normal; 
-color: #000; 
-background-color: #CCC;
-border-top: 2px solid #666;
-border-bottom: 1px solid #9CF;
-}
-
-#loginBox h2 {
-font-size: 1.2em; 
-margin: 0 0 1em 0;
-}
-
-#loginBox ul {
-list-style: none;
-margin: 1em 0;
-}
-
-#registerB {
-font-weight: bold; 
-text-align: right;
-}
-
-#portalTitle h1{
-font-size: 0.7em;
-font-weight: bold;
-margin: 5px 0  0 0px;
-border-bottom: 1px solid #CCC;
-}
-
-#portalLHS {
-padding-top: 0em;
-}
-
-.portalWrap {
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000;
-}
-
-.portletWrap {
-width: 100%;
-}
-
-.dirCat {
-margin-top: 5px;
-border-top: 1px solid #9CF;
-}
-
-.custLink  {
-margin-top: 1em;
-font-size: 0.7em; 
-font-weight: normal; 
-color: #000; 
-border-top: 1px solid #CCC;
-background-color: #EEE;
-}
-
-.custLink a {
-padding-right: 1em;
-}
-
-.directoryEntryLink {
-font-weight: bold; 
-}
-
-.logbx {
-width: 100px;
-font-size: 1em; 	
-}
-
-.logSubmit {
-text-align: right;
-border-top: 1px solid #9CF;
-}
-
-.loggo {  
-font-size: 1em;
-font-weight: normal; 
-height: 1.6em;
-background-color: #9CF;
-}
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/css/wysiwyg.css b/ccm-sci-bundle/web/themes/static/aplaws-generic/css/wysiwyg.css
deleted file mode 100644
index 2806df3c4..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/css/wysiwyg.css
+++ /dev/null
@@ -1,17 +0,0 @@
-
-.main {
-color: #333 !important;
-}
-
-.light {
-color: #CCC !important;
-}
-
-.medium {
-color: #6F3 !important;
-}
-
-.dark {
-color: #336 !important;
-font-weight: bold !important;
-}
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl
deleted file mode 100644
index 89557e8cb..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl
+++ /dev/null
@@ -1,308 +0,0 @@
-<xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
-				xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
-				xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-				xmlns:nav="http://ccm.redhat.com/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/static/aplaws/category-step.xsl"/>
-  	<xsl:import href="../../../../ROOT/themes/heirloom/packages/cms/admin/category-step/category-step.xsl"/>	
-  -->
-  <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
-  -->
-  <xsl:import href="../../category-step.xsl"/>
-  <xsl:import href="../../../heirloom/packages/cms/xsl/admin/category-step/category-step.xsl"/>	
-
-  <xsl:output method="html" indent="yes"/>
-
-	
-  <xsl:template match="forum:categoryStepSummary">
-   	<div class="content">
-   		
-	    <h3>Assign Categories</h3>
-		<br/>	   
-	    <xsl:for-each select="forum:categoryRoots/forum:categoryRoot">
-	      <xsl:sort  select="@name"/>
-	      <xsl:variable name="name">
-	        <xsl:value-of select="@name"/>
-	      </xsl:variable>
-	      <h5><xsl:value-of select="$name"/></h5>
-	      <br/>
-	      <xsl:if test="@addAction">
-	        <script LANGUAGE="JavaScript">
-	          <![CDATA[ <!-- begin script ]]>
-	          <![CDATA[ document.write('<a href="]]><xsl:value-of select="@addJSAction"/><![CDATA["><img src="/assets/category-step/action-add.png" border="0"/></a>')]]>
-	          <![CDATA[ document.write("\<!--") ]]>
-	          <![CDATA[ // end script --> ]]>
-	        </script>
-	        <a href="{@addAction}">
-	          <img src="/assets/category-step/action-add.png" border="0"/>
-	        </a>
-	        <script LANGUAGE="JavaScript">
-	          <![CDATA[ <!-- begin script ]]>
-	          <![CDATA[ document.write("--\>") ]]>
-	          <![CDATA[ // end script --> ]]>
-	        </script>
-	        
-	        <script LANGUAGE="JavaScript">
-	          <![CDATA[ <!-- begin script ]]>
-	          <![CDATA[ document.write('<a href="]]><xsl:value-of select="@addJSAction"/><![CDATA[">Add Categories</a>')]]>
-	          <![CDATA[ document.write("\<!--") ]]>
-	          <![CDATA[ // end script --> ]]>
-	        </script>
-	        <xsl:text>&#160;</xsl:text>
-	        <a href="{@addAction}">
-	          <xsl:text>Add categories</xsl:text>
-	        </a>
-	        <script LANGUAGE="JavaScript">
-	          <![CDATA[ <!-- begin script ]]>
-	          <![CDATA[ document.write("--\>") ]]>
-	          <![CDATA[ // end script --> ]]>
-	        </script>
-	      </xsl:if>
-	       
-	      <xsl:choose>
-	        <xsl:when test="count(../../forum:itemCategories/forum:itemCategory[starts-with(@path, $name)]) = 0">
-	          <div>
-	            There are no categories assigned in this context
-	          </div>
-	        </xsl:when>
-	        <xsl:otherwise>
-	          <ul>
-	            <xsl:for-each select="../../forum:itemCategories/forum:itemCategory[starts-with(@path, $name)]">
-	              <xsl:sort select="@path"/>
-	              <li>
-	                <xsl:value-of select="substring(@path, string-length($name) + 5)"/>&#160;
-	                <xsl:if test="@deleteAction">
-	                  <a href="{@deleteAction}"><img src="/assets/category-step/action-delete.png" border="0"/></a>
-	                  <xsl:text>&#160;</xsl:text>
-	                  <a href="{@deleteAction}">Remove</a>
-	                </xsl:if>
-	              </li>
-	            </xsl:for-each>
-	          </ul>
-	        </xsl:otherwise>
-	      </xsl:choose>
-	    </xsl:for-each>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="forum:categoryWidget">
-    <xsl:choose>
-      <xsl:when test="@mode = 'javascript'">
-        <xsl:apply-templates select="." mode="forum:javascript"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="." mode="forum:plain"/>        
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="forum:categoryWidget" mode="forum:javascript">
-    <script language="JavaScript">
-      <![CDATA[
-      <!-- Begin hiding
-      function catToggle(id) {
-        var elImg = document.getElementById("catTog"+id);
-        var elChildren = document.getElementById("catCh"+id);
-
-        if (elChildren.style.display != "block") {
-           elChildren.style.display = "block";
-           elImg.src = "/assets/category-step/action-delete.png";
-        } else {
-           elChildren.style.display = "none";
-           elImg.src = "/assets/category-step/action-add.png";
-        }
-        return true;
-      }
-      function catSelect(id, name, node) {
-        var elWidget = document.getElementById("catWd");
-        var elWidgetHidden = document.getElementById("catWdHd");
-        var found = 0;
-        for (var i = 0 ; i < elWidget.options.length ; i++) {
-          if (elWidget.options[i].value == id) {
-            found = 1;
-          }
-        }
-        if (!found) {
-          var opt = new Option(name, id);
-          elWidget.options[elWidget.options.length] = opt;
-
-          var optHidden = new Option(node, id, false, true);
-          elWidgetHidden.options[elWidgetHidden.options.length] = optHidden;
-        }
-
-        var elLink = document.getElementById("catLn"+node);
-        var elName = document.getElementById("catNm"+node);
-        elLink.style.display="none";
-        elName.style.display="inline";
-        return true;
-      }
-      function catDeselect() {
-      	var elWidget = document.getElementById("catWd");
-        var elWidgetHidden = document.getElementById("catWdHd");
-        var idx = elWidget.selectedIndex;
-        if (idx  != -1) {
-            //var id = elWidget.options[idx].value;
-            var node = elWidgetHidden.options[idx].text;
-            var elLink = document.getElementById("catLn"+node);
-            var elName = document.getElementById("catNm"+node);
-            elLink.style.display="inline";
-            elName.style.display="none";
-
-            elWidget.options[idx] = null;
-            elWidgetHidden.options[idx] = null;
-        }
-        return true;
-      }
-      // End hiding -->
-      ]]>
-    </script>
-    <div>
-      <xsl:apply-templates select="forum:category[@isEnabled = '1']" mode="forum:javascriptCat">
-        <xsl:with-param name="expand" select="'block'"/>
-      </xsl:apply-templates>
-    </div>
-    <br/>
-    <div class="content">    	
-	    <h4>Selected Categories</h4>
-	    <select id="catWd" size="5" onClick="catDeselect()" style="width: 400px; height=200px">
-	    </select>
-	    <select id="catWdHd" name="{@name}" size="5" multiple="multiple" style="display: none">
-	    </select>			
-  	 </div>
-  </xsl:template>
-
-  <xsl:template match="forum:category" mode="forum:javascriptCat">
-    <xsl:param name="expand" select="'none'"/>
-    <xsl:variable name="linkStyle">
-      <xsl:choose>
-        <xsl:when test="@isAbstract != '1' and @isSelected != '1'">
-          <xsl:value-of select="'inline'"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="'none'"/>        
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="nameStyle">
-      <xsl:choose>
-        <xsl:when test="@isAbstract != '1' and @isSelected != '1'">
-          <xsl:value-of select="'none'"/>        
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="'inline'"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <div id="catSelf{@pid}">
-    	<div class="content">
-	      <xsl:choose>
-	        <xsl:when test="count(forum:category[@isEnabled = '1']) > 0 and $expand='none'">
-	          <a href="#" onClick="catToggle('{@nodeID}');">
-	             <img id="catTog{@nodeID}" src="/assets/category-step/action-add.png" width="14" height="14" border="0"/></a>
-	        </xsl:when>
-	        <xsl:when test="count(forum:category[@isEnabled = '1']) > 0 and $expand!='none'">
-	          <a href="#" onClick="catToggle('{@nodeID}');"><img id="catTog{@nodeID}" src="/assets/category-step/action-delete.png" 
-	                      width="14" height="14" border="0"/></a>
-	        </xsl:when>
-	        <xsl:otherwise>
-	          <img src="/assets/category-step/action-generic.png" width="14" height="14" border="0"/>
-	        </xsl:otherwise>
-	      </xsl:choose>
-	      <a id="catLn{@nodeID}" href="#" style="padding-left: 6px; display: {$linkStyle}">
-	        <xsl:attribute name="onclick">catSelect('<xsl:value-of select="@id"/>', '<xsl:call-template name="escape-apostrophes">
-	          <xsl:with-param name="text" select="@fullname"/>
-	        </xsl:call-template>', '<xsl:value-of select="@nodeID"/>')</xsl:attribute>
-	
-	        <xsl:if test="@description">
-	          <xsl:attribute name="title">
-	            <xsl:value-of select="@description"/>
-	          </xsl:attribute>
-	        </xsl:if>
-	        <xsl:value-of select="@name"/>
-	      </a>
-	      <span id="catNm{@nodeID}" style="padding-left: 6px; display: {$nameStyle}">
-	        <xsl:if test="@description">
-	          <xsl:attribute name="title">
-	            <xsl:value-of select="@description"/>
-	          </xsl:attribute>
-	        </xsl:if>
-	        <xsl:value-of select="@name"/>
-	      </span>
-      </div>
-    </div>
-    <div id="catCh{@nodeID}" style="margin-left: 20px; display: {$expand}">
-      <xsl:apply-templates select="forum:category[@isEnabled = '1']" mode="forum:javascriptCat">
-        <xsl:sort data-type="number" select="@sortKey"/>
-      </xsl:apply-templates>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="forum:categoryWidget" mode="forum:plain">
-    <select name="{@name}" size="30" multiple="multiple">
-      <xsl:apply-templates select="forum:category[position() = 1]/forum:category[@isEnabled = '1' and @isAbstract = '0']" mode="forum:plainCat"/>
-    </select>
-  </xsl:template>
-
-  <xsl:template match="forum:category" mode="forum:plainCat">
-    <xsl:if test="@isSelected != '1' and @isAbstract != '1'">
-      <option value="{@sortKey}"><xsl:value-of select="@fullname"/></option>
-    </xsl:if>
-    
-    <xsl:apply-templates select="forum:category[@isEnabled = '1' and @isAbstract = '0']" mode="forum:plainCat">
-      <xsl:sort data-type="number" select="@sortKey"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <xsl:template name="escape-apostrophes">
-    <xsl:param name="text"/>
-    <xsl:variable name="apostrophe">'</xsl:variable>
-    <xsl:variable name="escaped-apostrophe">\'</xsl:variable>
-    <xsl:call-template name="do-replace">
-      <xsl:with-param name="text" select="$text"/>
-      <xsl:with-param name="replace" select="$apostrophe"/>
-      <xsl:with-param name="by" select="$escaped-apostrophe"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template name="do-replace">
-    <xsl:param name="text"/>
-    <xsl:param name="replace"/>
-    <xsl:param name="by"/>
-    <xsl:choose>
-      <xsl:when test="contains($text, $replace)">
-        <xsl:value-of select="substring-before($text, $replace)"/>
-        <xsl:value-of select="$by"/>
-        <xsl:call-template name="do-replace">
-          <xsl:with-param name="text" select="substring-after($text, $replace)"/>
-          <xsl:with-param name="replace" select="$replace"/>
-          <xsl:with-param name="by" select="$by"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$text"/>
-      </xsl:otherwise>
-    </xsl:choose>    
-  </xsl:template>
-  
-  <!--<xsl:template match="bebop:formAction[@name='category'] ">
-	<div class="content">
-		<form action="{@action}" name="{@name}" method="get">
-			<xsl:apply-templates select="bebop:gridPanel/bebop:formWidget[@type='hidden']" />
-			<xsl:apply-templates select="bebop:pageState" />
-			<xsl:apply-templates />		
-			<div class="forumButton">											
-				<xsl:apply-templates select="bebop:boxPanel/bebop:cell/bebop:boxPanel/bebop:cell/bebop:formWidget" />		
-				<br/>
-			</div>
-		</form>
-	</div>
-  </xsl:template>-->
-
-</xsl:stylesheet>
diff --git a/ccm-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
deleted file mode 100644
index 94f34946a..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl
+++ /dev/null
@@ -1,1312 +0,0 @@
-<?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/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
deleted file mode 100644
index c398a3e27..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.css
+++ /dev/null
@@ -1,403 +0,0 @@
-@import url("css/main.css");
-/* Chris presumably forgot the ! to comment the following 2 lines out
-/* <--@import url("/themes/heirloom/css/acs-master.css");-->   */
-/* <--@import url("/themes/heirloom/css/tabbed-pane/tabbed-pane.css");-->  */
-
-
-body {
-	margin: 0;
-	background-color: #FFF;
-	color: #000;
-	font-family: Verdana, Arial, Helvetica, sans-serif; 
-}
-
-.forum {
-	font-size: 0.8em;
-	margin: 8px 0 10px 2px;	
-}
-
-.content {
-	margin-left: 10px;
-}
-
-
-/*form submission*/
-
-.forumSelect {
-	margin-top: 0.2em;
-	float:left;
-}
-.forumButton input {
-	float:left;
-	margin-top: 0.2em;
-	margin-right: 5px;
-	padding-left: 2px;
-	padding-right: 2px;
-	color: #000;
-	background-color: #CCC;
-	vertical-align: middle;
-	border: 1px solid #000;
-	
-}
-
-.submit {
-	clear: both;
-	margin-left: 100px;	
-}
-
-/*
-view all threads
-
-*/
-
-#selectLabel {
-	float:left;
-	color: white;
-	padding-top: 0.2em;
-	padding-left: 0.2em;
-}
-#selectCategory {
-	background-color: #999;
-	height: 2.2em;
-	
-}
-
-#threadHead {
-	background-color: #E5F3FC;
-	font-weight: bold;
-	height: 1.5em;	
-	padding-left: 0.2em;
-	margin-bottom: 0.3em;
-	
-}
-#noMessages {
-	clear:both;
-	float:left;
-	width: 100%;
-	
-}
-.subject {
-	clear: both;
-	float:left;
-	width: 190px;
-	padding: 4px 0 4px 22px;
-	background-position: 4px 0.7em;
-	background-repeat: no-repeat;
-	background-image: url("images/forum/read.gif");
-}
-
-.topic {
-	clear:both;
-	float:left;
-	width: 212px;
-	padding: 4px 0 4px 0px;
-}
-
-.threadSubject {
-	clear:both;
-	float:left;
-	width: 140px;
-	padding: 4px 0 4px 0px;
-}
-
-.author {
-	float:left;
-	width: 100px;
-	padding: 4px 0 4px 0px;
-	text-align: center;
-}
-
-.replies {
-	float:left;
-	text-align: center;
-	width: 60px;
-	padding: 4px 0 4px 0px;
-}
-
-.threads {
-	float:left;
-	text-align: center;
-	width: 75px;
-	padding: 4px 0 4px 0px;
-}
-
-.status {
-	float:left;
-	width: 75px;
-	padding: 4px 0 4px 0px;
-}
-
-.delete {
-	float:left;
-	text-align: center;
-	width: 50px;
-	padding: 4px 0 4px 0px;
-}
-
-.lastPost {
-	float: left;
-	text-align: center;
-	width: 150px;
-	padding: 4px 0 4px 0px;
-}
-
-#newTopicLink a {	
-	padding: 4px 0 4px 22px;
-	background-position: 0px 0.3em;
-	background-repeat: no-repeat;
-	background-image: url("images/forum/post-16x16.gif");	
-}
-
-#viewAllTopicsLink a {
-	float: left;
-	padding: 4px 15px 4px 22px;
-	background-position: 0px 0.3em;
-	background-repeat: no-repeat;
-	background-image: url("images/forum/back-to-16x16.gif");
-	
-}
-
-#watchTopicLink a {
-	float: left;
-	padding: 4px 0 4px 22px;
-	background-position: 0px 0.3em;
-	background-repeat: no-repeat;
-	background-image: url("images/forum/watch-16x16.gif");
-	margin-left: 0.8em;
-	margin-bottom: 0.8em;
-}
-
-#info {
-	clear:both;
-	padding: 4px 0 4px 22px;
-	background-position: 0px 0.6em;
-	background-repeat: no-repeat;
-	background-image: url("images/forum/info-16x16.gif");
-	color: green;
-	margin-left: 0.8em;
-}
-
-.post {
-	clear: both;
-	margin-bottom: 0.8em;
-	font-size: 1em;
-}
-
-.postOdd {
-	background-color: #EFEFEF;
-
-}
-
-.postEven {
-	background-color: #FFFFFF;
-}
-
-#topic {
-	margin-bottom: 0.8em;
-	font-weight: bold;
-}
-
-.actions {
-	float: right;
-	margin-right: 0.3em;	
-}
-
-.header {	
-	float: left;	
-	margin-left: 0.3em;	
-	font-weight: bold;
-}
-
-.message {
-	clear: both;
-	float: left;
-	width:98%;
-    margin-left: 0.3em;
-	margin-bottom: 0.5em;
-}
-
-.postDetails {
-	clear: both;
-	float: left;
-	margin-bottom: 0.5em;
-	margin-left: 0.3em;
-}
-
-.bar {
-	clear:both;
-	float:left;
-	width: 98%;
-	padding-left: 0.3em;
-	padding-right: 0.3em;
-	padding-top: 0.5em;
-	padding-bottom: 0.5em;
-}
-
-.replyBar {
-	clear:both;	
-	padding-right: 0.3em;
-	padding-top: 0.5em;
-	padding-bottom: 0.5em;
-}
-
-
-.clearGroup {
-	clear:both;
-	margin-bottom: 0.5em;
-}
-
-.columnOne {
-	float: left;
-	width: 100px;
-	font-size: 1em;
-}
-
-.columnOneWide {
-	float: left;
-	width: 130px;
-	font-size: 1em;
-}
-
-.columnTwo {		
-	display: inline;
-	font-size: 1em;
-	margin: 0;		
-}
-
-
-.columnTwo input {
-	width: 300px;	
-}
-
-.columnTwo select {	
-	width: 300px;	
-}
-
-
-.columnTwo textArea {
-	width: 300px;	
-}
-
-.columnThree {
-	font-size: 1em;
-}
-
-#title {
-	float:left;
-	width: 100%;		
-		
-	font-size: 1.2em;
-}
-
-
-fieldset {
-	padding: 0.3em 0.3em 0.3em 0.3em;	
-}
-
-.fileLink {
-	margin-left: 0.5em;
-	clear: both;
-	float:left;
-}
-
-
-textarea {
-	width: 450px;
-}
-
-.validationError {
-	color: red;
-	margin-left: 100px;
-}
-
-#images {
-	clear: both;
-	float:left;
-	margin-left: 0.3em;	
-}
-
-#plainText {
-	clear: both;
-	font-size: 1em;
-	margin-bottom: 0.5em;
-}
-
-li {
-	list-style-position: inside;	
-}
-	
-.expiry input {
-	width: 50px;
-}
-
-.fileTable {
-	width: 100%;	
-}
-
-
-pre {
-
-	font-size: 1em;
-}
-
-
-/* Contents of tabbed-pane.css - forum tabs */
-
-div.tabbed-pane div, div.tabbed-pane table.tab-set, div.tabbed-pane table.tab-set td {
-  margin: 0;
-  border: 0;
-  padding: 0;
-}
-
-div.tabbed-pane table {
-  border-collapse: collapse;
-}
-
-div.tabbed-pane table.tab-set {
-  margin-left: 10px;
-}
-
-div.tabbed-pane table.tab-set a {
-  text-decoration: none;
-  color: rgb(63,63,63);
-}
-
-div.tabbed-pane table.tab-set td.tab-label {
-  margin-left: 4px;
-  padding: 5px 0 3px 10px;
- 
-  background: rgb(225,225,225) url(/css/tabbed-pane/tab-unselected.png) no-repeat;
-}
-
-div.tabbed-pane table.tab-set td.tab-end {
-  width: 10px;
-  background: url(/css/tabbed-pane/tab-unselected-end.png) no-repeat;
-}
-
-div.tabbed-pane table.tab-set td.current-tab-label {
-  margin-left: 4px;
-  padding: 5px 0 3px 10px;
-  background: rgb(162,30,30) url(/css/tabbed-pane/tab-selected.png) no-repeat;
-  color: white;
-}
-
-div.tabbed-pane table.tab-set td.current-tab-end {
-  width: 10px;
-  background: url(/css/tabbed-pane/tab-selected-end.png) no-repeat;
-}
-
-div.tabbed-pane table.tab-set td.tab-spacer {
-  width: 4px;
-}
-
-div.tabbed-pane table.rule {
-  margin-left: 10px; 
-  width: 100%;
-  background: rgb(162,30,30) url(/css/tabbed-pane/tab-bar.png) repeat-x;
-  height: 10px;
-}
-
-div.tabbed-pane div.current-pane {
-  width: 100%;
-}
-
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.xsl
deleted file mode 100644
index b87c2c0ce..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/forum-index.xsl
+++ /dev/null
@@ -1,1301 +0,0 @@
-<xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
-				xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
-				xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-				xmlns:nav="http://ccm.redhat.com/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">
-
-    <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-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/archived-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/archived-16x16.gif
deleted file mode 100644
index 2d3db34c2..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/archived-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/back-to-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/back-to-16x16.gif
deleted file mode 100644
index 95d374a32..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/back-to-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/delete-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/delete-16x16.gif
deleted file mode 100644
index 867d48eee..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/delete-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/edit-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/edit-16x16.gif
deleted file mode 100644
index 3e9a90a47..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/edit-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/info-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/info-16x16.gif
deleted file mode 100644
index 5acb95064..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/info-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/post-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/post-16x16.gif
deleted file mode 100644
index 07b98d107..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/post-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/read.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/read.gif
deleted file mode 100644
index 26d0d6fb5..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/read.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/reply-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/reply-16x16.gif
deleted file mode 100644
index 0395fca0f..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/reply-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/watch-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/watch-16x16.gif
deleted file mode 100644
index 01e001924..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-example/images/forum/watch-16x16.gif and /dev/null differ
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
deleted file mode 100644
index b27be9bbb..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-index.css
+++ /dev/null
@@ -1,403 +0,0 @@
-@import url("css/main.css");
-/* Chris presumably forgot the ! to comment the following 2 lines out
-/* <--@import url("/themes/heirloom/css/acs-master.css");-->   */
-/* <--@import url("/themes/heirloom/css/tabbed-pane/tabbed-pane.css");-->  */
-
-
-body {
-	margin: 0;
-	background-color: #FFF;
-	color: #000;
-	font-family: Verdana, Arial, Helvetica, sans-serif; 
-}
-
-.forum {
-	font-size: 0.8em;
-	margin: 8px 0 10px 2px;	
-}
-
-.content {
-	margin-left: 10px;
-}
-
-
-/*form submission*/
-
-.forumSelect {
-	margin-top: 0.2em;
-	float:left;
-}
-.forumButton input {
-	float:left;
-	margin-top: 0.2em;
-	margin-right: 5px;
-	padding-left: 2px;
-	padding-right: 2px;
-	color: #000;
-	background-color: #CCC;
-	vertical-align: middle;
-	border: 1px solid #000;
-	
-}
-
-.submit {
-	clear: both;
-	margin-left: 100px;	
-}
-
-/*
-view all threads
-
-*/
-
-#selectLabel {
-	float:left;
-	color: white;
-	padding-top: 0.2em;
-	padding-left: 0.2em;
-}
-#selectCategory {
-	background-color: #999;
-	height: 2.2em;
-	
-}
-
-#threadHead {
-	background-color: #E5F3FC;
-	font-weight: bold;
-	height: 1.5em;	
-	padding-left: 0.2em;
-	margin-bottom: 0.3em;
-	
-}
-#noMessages {
-	clear:both;
-	float:left;
-	width: 100%;
-	
-}
-.subject {
-	clear: both;
-	float:left;
-	width: 190px;
-	padding: 4px 0 4px 22px;
-	background-position: 4px 0.7em;
-	background-repeat: no-repeat;
-	background-image: url("images/forum/read.gif");
-}
-
-.topic {
-	clear:both;
-	float:left;
-	width: 212px;
-	padding: 4px 0 4px 0px;
-}
-
-.threadSubject {
-	clear:both;
-	float:left;
-	width: 140px;
-	padding: 4px 0 4px 0px;
-}
-
-.author {
-	float:left;
-	width: 100px;
-	padding: 4px 0 4px 0px;
-	text-align: center;
-}
-
-.replies {
-	float:left;
-	text-align: center;
-	width: 60px;
-	padding: 4px 0 4px 0px;
-}
-
-.threads {
-	float:left;
-	text-align: center;
-	width: 75px;
-	padding: 4px 0 4px 0px;
-}
-
-.status {
-	float:left;
-	width: 75px;
-	padding: 4px 0 4px 0px;
-}
-
-.delete {
-	float:left;
-	text-align: center;
-	width: 50px;
-	padding: 4px 0 4px 0px;
-}
-
-.lastPost {
-	float: left;
-	text-align: center;
-	width: 150px;
-	padding: 4px 0 4px 0px;
-}
-
-#newTopicLink a {	
-	padding: 4px 0 4px 22px;
-	background-position: 0px 0.3em;
-	background-repeat: no-repeat;
-	background-image: url("images/forum/post-16x16.gif");	
-}
-
-#viewAllTopicsLink a {
-	float: left;
-	padding: 4px 15px 4px 22px;
-	background-position: 0px 0.3em;
-	background-repeat: no-repeat;
-	background-image: url("images/forum/back-to-16x16.gif");
-	
-}
-
-#watchTopicLink a {
-	float: left;
-	padding: 4px 0 4px 22px;
-	background-position: 0px 0.3em;
-	background-repeat: no-repeat;
-	background-image: url("images/forum/watch-16x16.gif");
-	margin-left: 0.8em;
-	margin-bottom: 0.8em;
-}
-
-#info {
-	clear:both;
-	padding: 4px 0 4px 22px;
-	background-position: 0px 0.6em;
-	background-repeat: no-repeat;
-	background-image: url("images/forum/info-16x16.gif");
-	color: green;
-	margin-left: 0.8em;
-}
-
-.post {
-	clear: both;
-	margin-bottom: 0.8em;
-	font-size: 1em;
-}
-
-.postOdd {
-	background-color: #EFEFEF;
-
-}
-
-.postEven {
-	background-color: #FFFFFF;
-}
-
-#topic {
-	margin-bottom: 0.8em;
-	font-weight: bold;
-}
-
-.actions {
-	float: right;
-	margin-right: 0.3em;	
-}
-
-.header {	
-	float: left;	
-	margin-left: 0.3em;	
-	font-weight: bold;
-}
-
-.message {
-	clear: both;
-	float: left;
-	width:98%;
-    margin-left: 0.3em;
-	margin-bottom: 0.5em;
-}
-
-.postDetails {
-	clear: both;
-	float: left;
-	margin-bottom: 0.5em;
-	margin-left: 0.3em;
-}
-
-.bar {
-	clear:both;
-	float:left;
-	width: 98%;
-	padding-left: 0.3em;
-	padding-right: 0.3em;
-	padding-top: 0.5em;
-	padding-bottom: 0.5em;
-}
-
-.replyBar {
-	clear:both;	
-	padding-right: 0.3em;
-	padding-top: 0.5em;
-	padding-bottom: 0.5em;
-}
-
-
-.clearGroup {
-	clear:both;
-	margin-bottom: 0.5em;
-}
-
-.columnOne {
-	float: left;
-	width: 100px;
-	font-size: 1em;
-}
-
-.columnOneWide {
-	float: left;
-	width: 130px;
-	font-size: 1em;
-}
-
-.columnTwo {		
-	display: inline;
-	font-size: 1em;
-	margin: 0;		
-}
-
-
-.columnTwo input {
-	width: 300px;	
-}
-
-.columnTwo select {	
-	width: 300px;	
-}
-
-
-.columnTwo textArea {
-	width: 300px;	
-}
-
-.columnThree {
-	font-size: 1em;
-}
-
-#title {
-	float:left;
-	width: 100%;		
-		
-	font-size: 1.2em;
-}
-
-
-fieldset {
-	padding: 0.3em 0.3em 0.3em 0.3em;	
-}
-
-.fileLink {
-	margin-left: 0.5em;
-	clear: both;
-	float:left;
-}
-
-
-textarea {
-	width: 450px;
-}
-
-.validationError {
-	color: red;
-	margin-left: 100px;
-}
-
-#images {
-	clear: both;
-	float:left;
-	margin-left: 0.3em;	
-}
-
-#plainText {
-	clear: both;
-	font-size: 1em;
-	margin-bottom: 0.5em;
-}
-
-li {
-	list-style-position: inside;	
-}
-	
-.expiry input {
-	width: 50px;
-}
-
-.fileTable {
-	width: 100%;	
-}
-
-
-pre {
-
-	font-size: 1em;
-}
-
-
-/* Contents of tabbed-pane.css - forum tabs */
-
-div.tabbed-pane div, div.tabbed-pane table.tab-set, div.tabbed-pane table.tab-set td {
-  margin: 0;
-  border: 0;
-  padding: 0;
-}
-
-div.tabbed-pane table {
-  border-collapse: collapse;
-}
-
-div.tabbed-pane table.tab-set {
-  margin-left: 10px;
-}
-
-div.tabbed-pane table.tab-set a {
-  text-decoration: none;
-  color: rgb(63,63,63);
-}
-
-div.tabbed-pane table.tab-set td.tab-label {
-  margin-left: 4px;
-  padding: 5px 0 3px 10px;
- 
-  background: rgb(225,225,225) url(/themes/heirloom/css/tabbed-pane/tab-unselected.png) no-repeat;
-}
-
-div.tabbed-pane table.tab-set td.tab-end {
-  width: 10px;
-  background: url(/themes/heirloom/css/tabbed-pane/tab-unselected-end.png) no-repeat;
-}
-
-div.tabbed-pane table.tab-set td.current-tab-label {
-  margin-left: 4px;
-  padding: 5px 0 3px 10px;
-  background: rgb(162,30,30) url(/themes/heirloom/css/tabbed-pane/tab-selected.png) no-repeat;
-  color: white;
-}
-
-div.tabbed-pane table.tab-set td.current-tab-end {
-  width: 10px;
-  background: url(/themes/heirloom/css/tabbed-pane/tab-selected-end.png) no-repeat;
-}
-
-div.tabbed-pane table.tab-set td.tab-spacer {
-  width: 4px;
-}
-
-div.tabbed-pane table.rule {
-  margin-left: 10px; 
-  width: 100%;
-  background: rgb(162,30,30) url(/themes/heirloom/css/tabbed-pane/tab-bar.png) repeat-x;
-  height: 10px;
-}
-
-div.tabbed-pane div.current-pane {
-  width: 100%;
-}
-
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-index.xsl
deleted file mode 100644
index f7293d5f9..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/forum-index.xsl
+++ /dev/null
@@ -1,1306 +0,0 @@
-<?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/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="../../heirloom/packages/bebop/xsl/bebop.xsl" />
-	<xsl:import href="../../heirloom/packages/ui/xsl/ui.xsl" />
-<!-- 	<xsl:import href="../../heirloom/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="../../heirloom/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-sci-bundle/web/themes/static/aplaws-generic/images/aplaws-logo-small.png b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/aplaws-logo-small.png
deleted file mode 100644
index 3280df920..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/aplaws-logo-small.png and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/aplaws-logo.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/aplaws-logo.gif
deleted file mode 100644
index e0fa5a9ee..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/aplaws-logo.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/aplawsplus.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/aplawsplus.gif
deleted file mode 100644
index 576719675..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/aplawsplus.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/arrowSitemap.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/arrowSitemap.gif
deleted file mode 100644
index 278673f15..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/arrowSitemap.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif
deleted file mode 100644
index 2d3db34c2..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif
deleted file mode 100644
index 95d374a32..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif
deleted file mode 100644
index 867d48eee..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif
deleted file mode 100644
index 3e9a90a47..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/info-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/info-16x16.gif
deleted file mode 100644
index 5acb95064..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/info-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/post-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/post-16x16.gif
deleted file mode 100644
index 07b98d107..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/post-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/read.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/read.gif
deleted file mode 100644
index 26d0d6fb5..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/read.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif
deleted file mode 100644
index 0395fca0f..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif
deleted file mode 100644
index 01e001924..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/home.png b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/home.png
deleted file mode 100755
index bd1931dac..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/home.png and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/lock.png b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/lock.png
deleted file mode 100755
index 675f8cdf1..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/lock.png and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/customize.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/customize.gif
deleted file mode 100644
index 1fc3b9048..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/customize.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/delete.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/delete.gif
deleted file mode 100644
index 0a685ae48..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/delete.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/display.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/display.gif
deleted file mode 100644
index 820295a58..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/display.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/moveDown.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/moveDown.gif
deleted file mode 100644
index 9c631a238..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/moveDown.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/moveLeft.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/moveLeft.gif
deleted file mode 100644
index 09a282b51..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/moveLeft.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/moveRight.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/moveRight.gif
deleted file mode 100644
index ef767a035..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/moveRight.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/moveUp.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/moveUp.gif
deleted file mode 100644
index accc954a2..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/portal/moveUp.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/spacer.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/spacer.gif
deleted file mode 100644
index 5bfd67a2d..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/spacer.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/tlcArrow-s.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/tlcArrow-s.gif
deleted file mode 100644
index 9be407815..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/tlcArrow-s.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/tlcArrow.gif b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/tlcArrow.gif
deleted file mode 100644
index 8230bf333..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/tlcArrow.gif and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/w3c-css.bmp b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/w3c-css.bmp
deleted file mode 100644
index 7f7cf9381..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/w3c-css.bmp and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/w3c-css.png b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/w3c-css.png
deleted file mode 100644
index 020c75a73..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/w3c-css.png and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.bmp b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.bmp
deleted file mode 100644
index e0328dc6f..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.bmp and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.png b/ccm-sci-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.png
deleted file mode 100644
index 3855210c6..000000000
Binary files a/ccm-sci-bundle/web/themes/static/aplaws-generic/images/w3c-xhtml.png and /dev/null differ
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/body.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/body.xsl
deleted file mode 100644
index 0c1921625..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/body.xsl
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-  version="1.0">
-
-  <!--
-    This file contains templates relating to
-    generating <body> tags in HTML.
-  -->
-
-  <xsl:import href="user-banner.xsl"/>
-
-  <xsl:template name="aplaws:bodyHeader">
-    <div class="bodyHeader">
-      <xsl:apply-templates select="ui:userBanner"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template name="aplaws:bodyBreadcrumb">
-    <div class="bodyBreadcrumb">
-      <a href="/">APLAWS</a>&gt;<xsl:call-template name="aplaws:pageTitle"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template name="aplaws:bodyContent">
-    <h1><xsl:call-template name="aplaws:pageTitle"/></h1>
-    <div class="bodyContent">
-      <xsl:apply-templates select="*[not(@metadata.tag)]"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template name="aplaws:bodyFooter">
-    <div class="bodyFooter">
-      <xsl:apply-templates select="ui:siteBanner"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template name="aplaws:bodyDebug">
-    <div class="bodyDebug">
-      <xsl:apply-templates select="ui:debugPanel"/>
-      <xsl:apply-templates select="bebop:structure"/>
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/head.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/head.xsl
deleted file mode 100644
index 74c7e90c3..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/head.xsl
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-  version="1.0">
-
-  <!--
-     This file contains templates related
-     to generating <head> tags in HTML
-  -->
-  <xsl:param name="theme-prefix" />
-
-  <xsl:template name="aplaws:pageTitle">
-    <xsl:value-of select="/bebop:page/bebop:title"/>
-  </xsl:template>
-
-  <xsl:template name="aplaws:headerMetaData">
-    <meta name="title">
-      <xsl:attribute name="content">
-        <xsl:call-template name="aplaws:pageTitle"/>
-      </xsl:attribute>
-    </meta>
-  </xsl:template>
-
-<!-- The file ~/lib/page.css does not exist at least since version 1.0.2
-     there exists a file of this name in
-     ccm-cms/web/themes/packages/cms/admin/page/page.css
-     may be a copy&paste error                                               -->
-  <xsl:template name="aplaws:headerStyleSheets">
-    <link rel="stylesheet" href="{$theme-prefix}/lib/page.css" type="text/css" media="screen"/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/header.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/header.xsl
deleted file mode 100644
index 48c37d16a..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/header.xsl
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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/navigation"
-  exclude-result-prefixes="xsl bebop aplaws ui cms nav"
-  version="1.0">
-
-  
-	
-
-
-<xsl:template name="cssStyles">
-<link rel="stylesheet" href="{$theme-prefix}/css/main.css" type="text/css" media="all"/>
-<link rel="stylesheet" href="{$theme-prefix}/css/wysiwyg.css" type="text/css" media="all"/>
-</xsl:template>
-
-
-  
-
-
-
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/leftNav.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/leftNav.xsl
deleted file mode 100644
index 40d397605..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/leftNav.xsl
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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/navigation"
-  exclude-result-prefixes="xsl bebop aplaws ui cms nav"
-  version="1.0">
-
-
-
-
-<xsl:template name="leftNav">
-		
-<div id="nav">
-<xsl:for-each select="/bebop:page/nav:categoryMenu//nav:category[@isSelected='true']">
-<xsl:choose>
-
-
-
-<xsl:when test="position() = last()">
-
-
-<div class="navUp">
-<!-- category above -->
-<xsl:for-each select="../../nav:category[@isSelected='true']">
-<xsl:if test="../../nav:categoryMenu">
-<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>
-</xsl:if>
-
-<xsl:if test="not(../../nav:categoryMenu)">
-<a href="{@url}">
-<xsl:attribute name="title">up to <xsl:value-of select="@title" /></xsl:attribute>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>#094;
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;<xsl:value-of select="@title" />
-</a>
-</xsl:if>
-</xsl:for-each>
-
-
-
-<!-- category above if homepage/root-->
-<xsl:for-each select="../../nav:categoryMenu">
-<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>
-</xsl:for-each>
-<span class="hide">|</span>
-</div>
-
-
-
-<div class="navHere">
-<!-- selected category -->
-<p>
-<a href="{@url}" title="{@title}"><xsl:value-of select="@title" /></a>
-</p>
-<span class="hide">|</span>
-</div>
-		
-<!-- children -->
-<xsl:for-each select="./nav:category">
-<xsl:if test="not(@isSelected)">
-<a href="{@url}" class="navChild" title="{@title}"><xsl:value-of select="@title" /></a>
-</xsl:if>
-<span class="hide">|</span>
-</xsl:for-each>
-
-</xsl:when>
-</xsl:choose>
-</xsl:for-each>
-</div>
-</xsl:template>
-  
-</xsl:stylesheet>
-<!-- Stylus Studio meta-information - (c)1998-2003. Sonic Software Corporation. All rights reserved.
-<metaInformation>
-<scenarios/><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
-</metaInformation>
--->
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/lib.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/lib.xsl
deleted file mode 100644
index 2225e3d26..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/lib.xsl
+++ /dev/null
@@ -1,555 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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/navigation"
-               xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
-   exclude-result-prefixes="xsl bebop aplaws ui nav cms terms"
-                   version="1.0">
-
-<xsl:import href="../types/ContentTypes.xsl"/>
-
-<xsl:param name="theme-prefix"/>
-
-
-
-<xsl:template name="header">
-
-<!--HEADER -->
-
-<div id="header">
-
-<div id="logo">
-<a href="{$dispatcher-prefix}/portal/" title="APLAWS+ home">
-<img src="{$theme-prefix}/images/aplawsplus.gif" hspace="5" width="158" height="30" alt="APLAWS+ logo" />
-</a>
-</div>
-
-
-<div id="utils">
-	<span class="hide">|</span>
-	<a href="{$dispatcher-prefix}/portal/" title="home" accesskey="1">home</a>
-           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|
-           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-        <!--  atoz disabled, currently it only display categories (and indes pages), not content.
-              so, it's not so useful for general content pages 
-	<a href="{$dispatcher-prefix}/atoz" title="a-z">a-z</a><xsl:text disable-output-escaping="yes">&amp;
-           </xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-        -->
-	<a href="{$dispatcher-prefix}/navigation/sitemap.jsp" title="site map" accesskey="3">site map</a>
-           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|
-           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-	<a href="/contact" title="contact us" accesskey="9">contact us</a>
-           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|
-           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-	<a href="/help" title="help" accesskey="6">help</a>
-           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-           <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp; 
-</div>
-
-
-<div id="search">
-
-	<form name="search" method="get" action="{$dispatcher-prefix}/search/">
-			<label for="topSearch" accesskey="4">Search</label>
-			<input class="searchBox" id="topSearch" name="terms" value="search" />
-			<label for="topGo">Go</label>
-			<input type="submit" name="Submit" id="topGo" value="GO" class="go" />
-			<xsl:apply-templates select="bebop:pageState" />
-	</form>
-			
-			
-</div>
-<br id="clear"/>
-</div>
-
-
-
-<!--TOP LEVEL NAVIGATION -->
-<!--  hard coded navigation arranged horizonally, deactivated 
-<div id="tlcNav">
-
-<span class="hide">|</span>
-
-<p>
-<xsl:call-template name="TLC"/>
-</p>
-
-</div>
--->
-
-</xsl:template>
-
-
-
-
-<!--BREADCRUMB -->
-<xsl:template name="breadcrumb">
-
-<!--BREADCRUMB -->
-<span class="hide">|</span>
-<div id="bread">
-<p>
-<b>
-<a href="{$dispatcher-prefix}/portal/" title="home">home</a><xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;<xsl:text disable-output-escaping="yes">&amp;</xsl:text>gt;<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;</b> 
-<span class="hide">|</span>
-<xsl:for-each select="nav:categoryPath/nav:category[not(position()=1)]">
-<xsl:choose>
-<xsl:when test="not(position()=last())">
-<a>
-<xsl:attribute name="href"><xsl:value-of select="@url" /></xsl:attribute>
-<xsl:attribute name="title"><xsl:value-of select="@description" /></xsl:attribute>
-<xsl:value-of select="@title" />
-</a>
-<span class="hide">|</span>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;<span class="breadArrow"><xsl:text disable-output-escaping="yes">&amp;</xsl:text>gt;</span><xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-</xsl:when>
-<xsl:otherwise>
-<span class="breadHi"><xsl:value-of select="@title" /></span>
-</xsl:otherwise>
-</xsl:choose>
-</xsl:for-each>
-</p>
-<span class="hide">|</span>
-</div>
-
-</xsl:template>
-
-
-<!-- aplaws council navigation categories, 
-     originally CONFIGURED TO MATCH LGCL TOP CATEGORIES, hard coded 
-     may be used as an example if someone really needs hard coded navigation categories  -->
-<!--    deactivated for now
-<xsl:template name="TLC">  
-<span class="hide">|</span>
-<a href="{$dispatcher-prefix}/navigation/first-cat" title="First Category">first categoty</a>
-  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
-  </xsl:text>nbsp;
-<a href="{$dispatcher-prefix}/navigation/second-cat" title="Second Category">second category</a>
-  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
-  </xsl:text>nbsp;
-<a href="{$dispatcher-prefix}/navigation/third-cat" title="Third Category">third category</a>
-  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
-  </xsl:text>nbsp;
-<a href="{$dispatcher-prefix}/navigation/last-cat" title="Last Category">last category</a>
-</xsl:template>
-
--->
-
-
-<xsl:template name="footer">
-<div id="footer">
-
-<!-- if you use hard coded navigation categories, you may repeat them at the bottom of each page -->
-<!-- deactivated for now
-<p id="foottlc">
-<span class="hide">|</span>
-<a href="{$dispatcher-prefix}/navigation/first-cat" title="First Category">first categoty</a>
-  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
-  </xsl:text>nbsp;
-<a href="{$dispatcher-prefix}/navigation/second-cat" title="Second Category">second category</a>
-  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
-  </xsl:text>nbsp;
-<a href="{$dispatcher-prefix}/navigation/third-cat" title="Third Category">third category</a>
-  <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;
-  </xsl:text>nbsp;
-<a href="{$dispatcher-prefix}/navigation/last-cat" title="Last Category">last category</a>
-</p>
---> 
-
-<p id="legal"> 
- <span class="hide">|</span>
- <a href="/copyright" title="copyright">copyright</a>
-    <xsl:text disable-output-escaping="yes">&amp;nbsp;|&amp;nbsp;</xsl:text>
- <a href="/disclaimer" title="disclaimer and privacy statement" accesskey="8">disclaimer and privacy statement</a>
-    <xsl:text disable-output-escaping="yes">&amp;nbsp;|&amp;nbsp;</xsl:text>
- <a href="/contact" title="contact" accesskey="9">contact</a>
-    <xsl:text disable-output-escaping="yes">&amp;nbsp;|&amp;nbsp;</xsl:text>
- <a href="/accessibility" title="accessibility statement" accesskey="0">accessibility</a>
-</p>
-
-
-<p>
-<span class="hide">|</span>
-<a href="http://validator.w3.org/check/referer">
-  <img border="0" src="{$theme-prefix}/images/w3c-xhtml.png" alt="Valid HTML 4.01!" height="31" width="88" /></a>
-<span class="hide">|</span>
-<a href="http://jigsaw.w3.org/css-validator/">
-  <img style="border:0;width:88px;height:31px" src="{$theme-prefix}/images/w3c-css.png" alt="Valid CSS!" /></a>
-</p>
-
-
-</div>
-
-<xsl:call-template name="aplaws:bodyDebug"/>
-
-</xsl:template>
-
-
-<xsl:template name="pageContent">
-<a class="intLink" name="top" />
-<xsl:choose>
-<!-- CIs -->
-<xsl:when test="cms:contentPanel">
-  <xsl:apply-templates select="cms:contentPanel/cms:item"/>
-  <xsl:call-template name="fileAttachments" />
-  <xsl:call-template name="associatedLinks" />
-  <font family="arial">
-  </font>
-</xsl:when>
-<!-- A-Z -->
-<xsl:when test="cms:alphabetNavigation">
-<xsl:apply-templates select="ui:simplePageContent/cms:alphabetNavigation"/>
-<div id="navSpace"><img src="{$theme-prefix}/images/spacer.gif" alt="*" /></div>
-</xsl:when>
-<!-- Nav pages -->
-<xsl:otherwise>
-<xsl:call-template name="greeting" />
-<xsl:call-template name="contentLinks" />
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-
-
-
-
-<xsl:template name="Title">
-<xsl:choose>
-<xsl:when test="cms:contentPanel">
-<xsl:value-of select="cms:contentPanel/cms:item/title"/>
-</xsl:when>
-<xsl:when test="cms:alphabetNavigation">A to Z</xsl:when>
-<xsl:otherwise>
-<xsl:for-each select="/bebop:page/nav:categoryMenu//nav:category[@isSelected='true']">
-<xsl:if test="position() = last()">
-<xsl:value-of select="@title"/>
-</xsl:if>
-</xsl:for-each>
-</xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-
-
-
-
-
-
-<xsl:template name="greeting">
-  <xsl:for-each select="nav:greetingItem[@id='greetingItem']/cms:item">
-    <div id="greeting">
-      
-      <xsl:choose>
-
-        <xsl:when test="type[label = 'MultiPartArticle']">
-          <xsl:call-template name="CT_MultiPartArticle_graphics" />
-        </xsl:when>
-
-        <xsl:when test="type[label = 'Site Proxy']">
-          <xsl:call-template name="CT_SiteProxy_graphics" />
-        </xsl:when>
-
-        <xsl:otherwise>
-          <xsl:for-each select="imageCaptions">
-            <div id="CI_Image">
-              <img align="right">
-                <xsl:attribute name="src"><xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/?image_id=<xsl:value-of select="imageAsset/id" /></xsl:attribute>
-                <xsl:attribute name="alt"><xsl:value-of select="caption" /></xsl:attribute>
-              </img>
-            </div>
-          </xsl:for-each>
-          <p>
-            <xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
-          </p>
-        </xsl:otherwise>
-
-      </xsl:choose>
-
-    </div>
-  </xsl:for-each>
-</xsl:template>
-
-
-
-
-<xsl:template name="contentLinks">
-	<xsl:variable name="thisCategory" select="nav:categoryPath/nav:category[position()=last()]/@id"/>
-	<xsl:choose>
-  		<xsl:when test="nav:dateOrderCategories/nav:category[@id=$thisCategory]">
-  			<!-- this category should have items date ordered -->
-  			<xsl:call-template name="datedContentLinks">
-  				<xsl:with-param name="order" select = "nav:dateOrderCategories/nav:category[@id=$thisCategory]/@order"/>
-  			</xsl:call-template>
-  		</xsl:when>
-		<xsl:otherwise>
-  			<xsl:call-template name="undatedContentLinks"/>
-  		</xsl:otherwise>
-  	</xsl:choose>
-</xsl:template>
-
-<xsl:template name="undatedContentLinks">
-		
-	<xsl:for-each select="nav:simpleObjectList/nav:objectList">
-		<div id="contentLinks">
-		<xsl:for-each select="nav:item">
-		<a>
-		<xsl:attribute name="href"><xsl:value-of select="nav:path" /></xsl:attribute>
-		<xsl:attribute name="title"><xsl:value-of select="nav:attribute[@name='title']" /></xsl:attribute>
-		<xsl:value-of select="nav:attribute[@name='title']" />
-		</a>
-		<span class="hide">|</span>
-		</xsl:for-each>
-		</div>
-	</xsl:for-each>
-</xsl:template>
-
-<xsl:template name="datedContentLinks">
-  	<xsl:param name="order"/> 
-	<xsl:comment>Dated Links</xsl:comment>
-	<xsl:for-each select="nav:simpleObjectList/nav:objectList">
-	    <div id="contentLinks">
-			<xsl:comment>Items ordered in <xsl:value-of select ="$order"/> order</xsl:comment>
-            <xsl:for-each select="nav:item">
-				<!-- nb can't put nav:attribute[@name='launchDate' and @usage='sort'] into a variable because it 
-				     will not be initialised for items without launch date, and so sort will fail -->
-				<xsl:sort select="nav:attribute[@name='launchDate']/@year" order = "{$order}" data-type="number"/>
-	    		<xsl:sort select="nav:attribute[@name='launchDate']/@month" order = "{$order}" data-type="number"/>
-	    		<xsl:sort select="nav:attribute[@name='launchDate']/@day" order = "{$order}" data-type="number"/>
-                <xsl:sort select="nav:attribute[@name='launchDate']/@hour" order = "{$order}" data-type="number"/>
-                <xsl:sort select="nav:attribute[@name='launchDate']/@minute" order = "{$order}" data-type="number"/>
-                <xsl:sort select="nav:attribute[@name='launchDate']/@second" order = "{$order}" data-type="number"/>
-	    		<xsl:sort select="nav:attribute[@name='title']"/>
-	      		<a>
-					<xsl:attribute name="href"><xsl:value-of select="nav:path" /></xsl:attribute>
-					<xsl:attribute name="title"><xsl:value-of select="nav:attribute[@name='title']" /></xsl:attribute>
-					<!-- if there is a launch date, prepend title with date, so that the order of 
-				     entries makes sense -->             
-	             	<xsl:if test="nav:attribute[@name='launchDate']">  
-	             		 
-	       				<xsl:value-of select="nav:attribute[@name='launchDate']"/> - 
-	          			<!-- line above displays the locale specific version of the date - personally I think
-	          			     the default long version looks awful - maybe short format can be specified in 
-	          			     com.arsdigita.navigation.DataCollectionRenderer. Alternative approach
-                             is to construct short date with the available attributes eg UK version below 
-                             (which could do with some left padding on day & month so that the dates align correctly)
-                        <xsl:value-of select="nav:attribute[@name='launchDate']/@day"/>/
-                        <xsl:value-of select="nav:attribute[@name='launchDate']/@month"/>/
-                        <xsl:value-of select="nav:attribute[@name='launchDate']/@year"/> - -->
-	          		</xsl:if>       
-	              	<xsl:value-of select="nav:attribute[@name='title']" /> 
-	            </a>
-	      	   	<span class="hide">|</span>
-	        </xsl:for-each>
-	     </div>
-    </xsl:for-each>
-</xsl:template>
-
-
-
-
-
-<xsl:template name="fileAttachments">
-<xsl:if test="cms:contentPanel/cms:item/fileAttachments">
-<div class="attachment">
-<h2>Related Files:</h2>
-<ul class="linklist">
-<xsl:for-each select="cms:contentPanel/cms:item/fileAttachments">
-<xsl:sort select="fileOrder" data-type="number" />
-<li>
-<xsl:value-of select="name"/> - 
-<xsl:value-of select="description"/>
-<a  href="{$dispatcher-prefix}/cms-service/stream/asset/?asset_id={./id}" title="view file">[View]</a>
-<a  href="{$dispatcher-prefix}/cms-service/download/asset/?asset_id={./id}" title="save file to your computer">[Save]</a>
-</li>
-</xsl:for-each>
-</ul>
-</div>
-</xsl:if>
-</xsl:template>	
-
-<!-- URL Encoding Template Begin -->
-<!-- Taken on as is basis.Written by Mike J. Brown, mike@skew.org.
-     No license; use freely, but credit me if reproducing in print.
-     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>
-<!-- URL Encoding Template End -->
-
-<xsl:template name="associatedLinks">
-<xsl:if test="cms:contentPanel/cms:item/links">
-<div class="attachment">
-<h2>Associated Links:</h2>
-<ul class="linklist">
-<xsl:for-each select="cms:contentPanel/cms:item/links">
-<xsl:sort select="linkOrder" data-type="number" />
-<li>
-  <a>
-    <xsl:attribute name="href">
-      <xsl:choose>
-        <xsl:when test="targetType='internalLink'">
-        <xsl:text>/redirect/?oid=</xsl:text>
-        <xsl:call-template name="url-encode">
-          <xsl:with-param name="str">
-             <xsl:value-of select="targetItem/@oid"/>
-          </xsl:with-param>
-        </xsl:call-template>
-<!--          <xsl:text>/redirect/?oid=</xsl:text><xsl:value-of select="targetItem/@oid"/> -->
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="targetURI"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-    <xsl:attribute name="title"><xsl:value-of select="./linkDescription" /></xsl:attribute>
-    <xsl:if test="./targetWindow">
-       <xsl:attribute name="target"><xsl:value-of select="./targetWindow" /></xsl:attribute>
-    </xsl:if>
-    <xsl:value-of disable-output-escaping="yes" select="./linkTitle" />
-	</a>
-- <xsl:value-of select="./linkDescription" />
-
-</li>
-</xsl:for-each>
-</ul>
-</div>
-</xsl:if>
-</xsl:template>	
-
-
-<xsl:template name="relatedItems">
-<xsl:for-each select="nav:relatedItems">
-    <h2>Related Items</h2>
-		<xsl:for-each select="nav:relatedItem">
-		<a href="{@path}" title="{@title}"><xsl:value-of select="@title" /></a>
-		</xsl:for-each>
-		<span class="hide">|</span>
-</xsl:for-each>
-</xsl:template>
-
-
-<xsl:template name="metaData">
-<meta name="eGMS.accessibility" scheme="WCAG" content="Double-A" />
-<meta name="DCTERMS.audience" content="" scheme="LGAL" href="http://www.esd.org.uk/standards/lgal/" />
-<xsl:for-each select="descendant::dublinCore">
-<meta name="DC.coverage.spatial" scheme="ONS SNAC" content="{./dcCoverageSpatialRef}" />
-<meta name="DC.coverage.temporal.beginnningDate" scheme="ISO 639-2" ><xsl:attribute name="content"><xsl:call-template name="metaDate"><xsl:with-param name="date" select="./dcTemporalBegin" /></xsl:call-template></xsl:attribute></meta>
-<meta name="DC.coverage.temporal.endDate"  scheme="ISO 639-2" ><xsl:attribute name="content"><xsl:call-template name="metaDate"><xsl:with-param name="date" select="./dcTemporalEnd" /></xsl:call-template></xsl:attribute></meta>
-<meta name="DC.creator" content="{./dcCreatorOwner}" />
-<meta name="Dc.date.valid" scheme="ISO8601" ><xsl:attribute name="content"><xsl:call-template name="metaDate"><xsl:with-param name="date" select="./dcDateValid" /></xsl:call-template></xsl:attribute></meta>
-<meta name="eGMS.disposal.review" scheme="ISO8601" ><xsl:attribute name="content"><xsl:call-template name="metaDate"><xsl:with-param name="date" select="./dcDisposalReview" /></xsl:call-template></xsl:attribute></meta>
-<meta name="DC.identifier" content="" schmeme="URI"/>
-<meta name="DC.language" content="{./dcLanguage}" scheme="ISO 639-2" />
-<meta name="DC.publisher" content="{./dcPublisher}" />
-<meta name="DC.rights" content="{./dcRights}" />
-<meta name="DC.relation.isFormatOf" content="{$context-prefix}{//bebop:page/@url}?output=xml" />
-<meta name="DC.subject"><xsl:attribute name="content"><xsl:call-template name="metaTranslate"><xsl:with-param name="toTranslate" select="./dcKeywords" /></xsl:call-template></xsl:attribute></meta>
-</xsl:for-each>
-
-<xsl:for-each select="terms:assignedTerms/terms:term">
-<xsl:choose>
-<xsl:when test="@domain='GCL'">
-<meta name="eGMS.subject.category" content="{@name}" scheme="GCL" href="http://www.esd.org.uk/standards/gcl/gcl.xml" />
-</xsl:when>
-<xsl:when test="@domain='LGCL'">
-<meta name="eGMS.subject.category" content="{@name}" scheme="LGCL" href="http://www.esd.org.uk/standards/lgcl/lgcl.xml" />
-</xsl:when>
-<xsl:when test="@domain='LGSL'">
-<meta name="eGMS.subject.service" content="{@id}" scheme="LGSL" href="http://www.esd.org.uk/standards/lgsl/lgsl.xml" />
-</xsl:when>
-<xsl:when test="@domain='LGIL'">
-<meta name="eGMS.subject.interaction" content="{@name}" scheme="LGIL" href="http://www.esd.org.uk/standards/lgil/lgil.xml" />
-</xsl:when>
-</xsl:choose>
-</xsl:for-each>
-
-<meta name="DC.title">
-<xsl:attribute name="content">APLAWS+: <xsl:call-template name="Title" /></xsl:attribute>
-</meta>
-
-</xsl:template>
-
-
-
-<xsl:template name="metaTranslate">
-<xsl:param name="toTranslate" />
-<xsl:value-of select="translate($toTranslate,',' , ';')" />
-</xsl:template>
-
-
-
-<xsl:template name="metaDate"><xsl:param name="date" />20<xsl:value-of select="substring($date, 8, 2)" />
-	<xsl:text>-</xsl:text>
-	<xsl:variable name="month" 
-     select="substring($date, 4, 3)"/>
-	<xsl:choose>
-		<xsl:when test="$month='Jan'">01</xsl:when>
-		<xsl:when test="$month='Feb'">02</xsl:when>
-		<xsl:when test="$month='Mar'">03</xsl:when>
-		<xsl:when test="$month='Apr'">04</xsl:when>
-		<xsl:when test="$month='May'">05</xsl:when>
-		<xsl:when test="$month='Jun'">06</xsl:when>
-		<xsl:when test="$month='Jul'">07</xsl:when>
-		<xsl:when test="$month='Aug'">08</xsl:when>
-		<xsl:when test="$month='Sep'">09</xsl:when>
-		<xsl:when test="$month='Oct'">10</xsl:when>
-		<xsl:when test="$month='Nov'">11</xsl:when>
-		<xsl:when test="$month='Dec'">12</xsl:when>
-	</xsl:choose>
-	<xsl:text>-</xsl:text>
-	<!-- Day -->
-	<xsl:value-of select="number(substring($date, 1, 2))" />
-</xsl:template>
-
-
-<xsl:template name="aplaws:bodyDebug">
-    <div class="bodyDebug">
-      <xsl:apply-templates select="ui:debugPanel"/>
-      <xsl:apply-templates select="bebop:structure"/>
-    </div>
-</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/page.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/page.xsl
deleted file mode 100644
index 9af4bce18..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/page.xsl
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-  version="1.0">
-
-  <xsl:import href="head.xsl"/>
-  <xsl:import href="body.xsl"/>
-<!--   <xsl:import href="../../../../packages/bebop/xsl/dcp.xsl"/>  -->
-  <xsl:import href="../../../heirloom/packages/bebop/xsl/dcp.xsl"/>
-
-  <xsl:output method="html"/>
-
-
-  <xsl:template match="bebop:page[@class='simplePage']">
-    <html>
-      <head>
-        <title><xsl:call-template name="aplaws:pageTitle"/></title>
-        <xsl:call-template name="aplaws:headerMetaData"/>
-        <xsl:call-template name="aplaws:headerStyleSheets"/>
-      </head>
-      
-      <body style="margin: 0em">
-        <xsl:call-template name="bebop:dcpJavascript"/>
-        <xsl:call-template name="aplaws:bodyHeader"/>
-        <xsl:call-template name="aplaws:bodyBreadcrumb"/>
-        <xsl:call-template name="aplaws:bodyContent"/>
-        <xsl:call-template name="aplaws:bodyFooter"/>
-        <xsl:call-template name="aplaws:bodyDebug"/>
-      </body>
-    </html>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/user-banner.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/user-banner.xsl
deleted file mode 100644
index 8e25861d3..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/lib/user-banner.xsl
+++ /dev/null
@@ -1,110 +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="theme-prefix" />
- 
- <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>
-         <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>
-             <td class="global-link-icon">
-              <a>
-               <xsl:attribute name="href">
-                <xsl:value-of select="@workspaceURL"/>
-               </xsl:attribute>
-               <img src="{$theme-prefix}/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:text>Home</xsl:text>
-               </a>
-             </td>
-
-             <td class="global-link-icon">
-              <a>
-               <xsl:attribute name="href">
-                 <xsl:value-of select="@logoutURL"/>
-               </xsl:attribute>
-               <img src="{$theme-prefix}/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:text>Logout</xsl:text>
-              </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-sci-bundle/web/themes/static/aplaws-generic/navigation-admin.css b/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-admin.css
deleted file mode 100644
index 41b5cdea9..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-admin.css
+++ /dev/null
@@ -1,2 +0,0 @@
-@import url("/themes/heirloom/css/acs-master.css");
-@import url("/themes/heirloom/apps/navigation/xsl/admin.css");
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-admin.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-admin.xsl
deleted file mode 100644
index ce8f82af0..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-admin.xsl
+++ /dev/null
@@ -1,16 +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="../../../../ROOT/themes/heirloom/apps/navigation/xsl/admin.xsl"/>
-  <xsl:import href="lib/page.xsl"/>
-
-  <xsl:param name="theme-prefix" />
-
-  <xsl:template name="aplaws:headerStyleSheets">
-    <link rel="stylesheet" href="{$theme-prefix}/navigation-admin.css" type="text/css" media="screen"/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-directory.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-directory.xsl
deleted file mode 100644
index 3e6a59603..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-directory.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="../../heirloom/packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../heirloom/packages/ui/xsl/ui.xsl"/>
-  <xsl:import href="lib/page.xsl"/>
-
-  <xsl:param name="theme-prefix" />
-
-  <xsl:template name="aplaws:headerStyleSheets">
-    <!--
-    <link rel="stylesheet" href="{$theme-prefix}/forum-index.css" type="text/css" media="screen"/>
-    -->
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-index.xsl
deleted file mode 100644
index 800e9c2a9..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-index.xsl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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/navigation"
- 
-    exclude-result-prefixes="xsl bebop aplaws ui cms nav"
-                    version="1.0">
-
-  <xsl:import href="../../heirloom/apps/navigation/xsl/index.xsl"/>
-  <xsl:import href="content-section-index.xsl"/>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-services.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-services.xsl
deleted file mode 100644
index db3673ea0..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-services.xsl
+++ /dev/null
@@ -1,18 +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="../../heirloom/packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../heirloom/packages/ui/xsl/ui.xsl"/>
-  <xsl:import href="lib/page.xsl"/>
-
-  <xsl:param name="theme-prefix" />
-
-  <xsl:template name="aplaws:headerStyleSheets">
-    <!--
-    <link rel="stylesheet" href="{$theme-prefix}/forum-index.css" type="text/css" media="screen"/>
-    -->
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-sitemap.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-sitemap.xsl
deleted file mode 100644
index ccb45f5da..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-sitemap.xsl
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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/navigation"
-                xmlns:search="http://rhea.redhat.com/search/1.0"
-                  xmlns:atoz="http://xmlns.redhat.com/atoz/1.0"
-     exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz"
-                     version="1.0">
-
-
-	
-<xsl:import href="lib/header.xsl"/>
-<xsl:import href="lib/lib.xsl"/>
-<xsl:import href="../../heirloom/packages/bebop/xsl/dcp.xsl"/>
-
-<xsl:param name="context-prefix"></xsl:param>
-<xsl:param name="dispatcher-prefix" />
-<xsl:param name="theme-prefix" />
-
-<xsl:output
-	method="html"
-	doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
-	doctype-system="http://www.w3.org/TR/html4/loose.dtd"
-	indent="yes"
-/>
-
-
-
-<xsl:template match="bebop:page">
-<html lang="en">
-	<head>
-		<title>APLAWS+: Site Map</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="sitemapBreadcrumb"/>
-		<xsl:call-template name="sitemapBody"/>
-  </body>
-</html>
-</xsl:template>
-
-
-
-
-<xsl:template name="sitemapBody">
-<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="sitemapNav" />
-		</td>
-    <td colspan="2" align="left" valign="top" id="title">
-		<!--MAIN CONTENT -->
-		<h1>Site Map</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>
-		<a class="intLink" name="top" />
-		<xsl:call-template name="sitemapMain" />	
-	</td>
-	<td width="20%" height="400" align="left" valign="top" id="RHS">
-  </td>
-</tr>
-</table>
-<xsl:call-template name="footer"/>
-</xsl:template>
-
-
-
-
-
-
-
-
-<xsl:template name="sitemapBreadcrumb">
-<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">Site Map</span>
-</p>
-</div>
-</xsl:template>
-
-
-
-
-<xsl:template name="sitemapNav">
-<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>
-<div class="navHere"><p>Sitemap</p></div>
-<a href="/sitemaphelp" class="navChild" title="Sitemap explained" >Site Map explained</a><span class="hide">|</span>
-</div>
-</xsl:template>
-
-
-
-
-
-
-
-
-<xsl:template name="sitemapMain">
-<div id="siteArea">
-
-			<div id="siteInfo">Select an area to view</div>
-			
-			<div id="topSiteList">
-			<xsl:for-each select="nav:categoryHierarchy/nav:category[@depth='0']">
-			<a href="#{@title}" title="jump to {@title}"><xsl:value-of select="@title" /></a><span class="hide">|</span>
-			</xsl:for-each>
-			</div>
-</div>
-
-<xsl:call-template name="sitemapFullList" />
-
-</xsl:template>
-
-
-
-
-
-
-<xsl:template name="sitemapFullList">
-<div id="siteList">
-		
-		<xsl:for-each select="nav:categoryHierarchy">
-		<ul class="L1">
-		<xsl:for-each select="./nav:category[@depth='0']">
-		<li class="cat1"><a name="{@title}" href="{@url}" class="anchor"><xsl:value-of select="@title" /></a>
-
-			<ul class="L2">
-			<xsl:for-each select="./nav:category[@depth='1']">
-			<li class="cat2"><a href="{@url}"><xsl:value-of select="@title" /></a>
-				
-				<ul class="L3">
-				<xsl:for-each select="./nav:category[@depth='2']">
-				<li class="cat3"><a href="{@url}" class="item"><xsl:value-of select="@title" /></a>
-					
-					<xsl:if test="./nav:category[@depth='3']">
-					<ul class="L4">
-						<xsl:for-each select="./nav:category[@depth='3']">
-						<li class="cat4"><a href="{@url}" class="item"><xsl:value-of select="@title" /></a></li>
-						</xsl:for-each>
-					</ul>
-					</xsl:if>
-
-				</li>
-				</xsl:for-each>
-				</ul>
-
-			</li>
-			</xsl:for-each>
-			</ul>
-		</li>
-		
-		<li class="toTop"><a href="#top">top</a></li>
-		</xsl:for-each>
-		</ul>
-		</xsl:for-each>
-
-		
-			
-
-			
-		</div>
-</xsl:template>
-
-
-
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-summary.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-summary.xsl
deleted file mode 100644
index 362666eb8..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/navigation-summary.xsl
+++ /dev/null
@@ -1,34 +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"
-                xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
-                    version="1.0">
-
-  <xsl:import href="../../heirloom/apps/navigation/xsl/index.xsl"/>
-  
-  
-  <xsl:import href="content-section-index.xsl"/>
-  
-  <xsl:template name="pageContent">
-    <xsl:apply-templates select="terms:termItemCountSummary"/>
-  </xsl:template>
-
-  <xsl:template match="terms:termItemCountSummary">
-    <table>
-      <tr>
-        <th>PID</th>
-        <th>Term</th>
-        <th># items</th>
-      </tr>
-      <xsl:for-each select="terms:term">
-        <xsl:sort data-type="number" select="@id"/>
-        <tr>
-          <td><xsl:value-of select="@id"/></td>
-          <td><a href="pid.jsp?pid={@id}"><xsl:value-of select="@name"/></a></td>
-          <td><xsl:value-of select="@count"/></td>
-        </tr>
-      </xsl:for-each>
-    </table>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal-workspace-admin.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal-workspace-admin.xsl
deleted file mode 100644
index 39445320e..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal-workspace-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="../../../themes/heirloom/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-sci-bundle/web/themes/static/aplaws-generic/portal-workspace-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal-workspace-index.xsl
deleted file mode 100644
index e95f5a4e1..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal-workspace-index.xsl
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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/navigation"
-             xmlns:search="http://rhea.redhat.com/search/1.0"
-             xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  exclude-result-prefixes="xsl bebop aplaws ui cms nav search portal"
-                  version="1.0">
-
-<!--  <xsl:import href="../../../themes/heirloom/apps/workspace/xsl/index.xsl"/>  -->
-<xsl:import href="../../heirloom/apps/portal-workspace/xsl/index.xsl"/>
-
-<xsl:import href="portal/lib.xsl"/>
-<xsl:import href="portal/portlets.xsl"/>
-<xsl:import href="lib/header.xsl"/>
-<xsl:import href="lib/lib.xsl"/>
-<!-- <xsl:import href="../../../packages/bebop/xsl/dcp.xsl"/>  -->
-<xsl:import href="../../heirloom/packages/bebop/xsl/dcp.xsl"/>
-
-<xsl:param name="context-prefix"></xsl:param>
-<xsl:param name="dispatcher-prefix" />
-<xsl:param name="theme-prefix" />
-
-
-<xsl:output 
-	method="html"
-	doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
-	doctype-system="http://www.w3.org/TR/html4/loose.dtd"
-	indent="yes" 
-/>
-
-
-<xsl:template match="bebop:page[@application='portal']">
-<html lang="en">
-	<head>
-		<title>APLAWS+: <xsl:call-template name="Title"/></title>
-		<!--<xsl:call-template name="aplaws:headerMetaData"/>-->
-		<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="wsBreadcrumb"/>
-		 <xsl:choose>
-          <xsl:when test="count(/bebop:page/portal:homepageWorkspace) > 0">
-            <xsl:call-template name="wsBody"/>            
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="portal:workspace"/>
-			<xsl:call-template name="footer"/>
-          </xsl:otherwise>
-       </xsl:choose>
-	</body>
-</html>
-</xsl:template>
-
-
-
-
-
-<xsl:template name="wsBreadcrumb">
-
-<!--BREADCRUMB -->
-
-<div id="bread">
-<p>
-<b><a href="{$dispatcher-prefix}/portal/" title="home">home</a></b>
-</p>
-</div>
-</xsl:template>
-
-
-<xsl:template name="wsBody">
-    
-<table id="mainLayout" width="100%" border="0" cellspacing="0" cellpadding="5"
-       summary="This table is used for a three-column page layout">
-<tr>
-    <td width="20%" align="left" valign="top" >
-<!--VOID LHS Column -->
-	 </td>
-    <td colspan="2" align="left" valign="top" id="portalTitle">
-<!--TITLE -->
-		<h1>APLAWS+ Plus</h1>
-	</td>
-</tr>
-<tr>
-  <td width="20%" align="left" valign="top" id="portalLHS">
-<!--LHS Column -->
-	<a id="startcontent" title="Start of content"></a>
-	<xsl:apply-templates select="//portal:homepageWorkspace[@id='left']/portal:portal"/>
-	<xsl:for-each select="//portal:homepageWorkspace[@id='left']/bebop:link">
-			<div class="custLink"><xsl:apply-templates select="."/></div>
-	</xsl:for-each>
-  </td>
-  <td width="60%" height="100%" align="left" valign="top" id="mainContent">
-<!--Middle Column -->
-	<xsl:apply-templates select="//portal:homepageWorkspace[@id='middle']/portal:portal"/>
-	<xsl:for-each select="//portal:homepageWorkspace[@id='middle']/bebop:link">
-			<div class="custLink"><xsl:apply-templates select="."/></div>
-	</xsl:for-each>
-	</td>
-	<td width="20%" height="400" align="left" valign="top" id="RHS">
-<!--RHS Column -->		
-	<xsl:apply-templates select="//portal:homepageWorkspace[@id='right']/portal:portal"/>
-	<xsl:for-each select="//portal:homepageWorkspace[@id='right']/bebop:link">
-			<div class="custLink"><xsl:apply-templates select="."/></div>
-	</xsl:for-each>
-  </td>
-  </tr>
-</table>
-<xsl:call-template name="footer"/>
-</xsl:template>
-
-
-
-
-
-<xsl:template match="portal:homepageWorkspace/bebop:link">
-<xsl:choose>
-<xsl:when test="./bebop:label='browse'"><a href="{@href}"  
-          class="adminReturn"
-          title="Return to the standard page view">back to user's view</a></xsl:when>
-<xsl:when test="./bebop:label='reset'"><a href="{@href}" class="adminWarning"
-          title="WARNING!!: This link will delete the whole area!">delete area</a></xsl:when>
-<xsl:when test="./bebop:label='customize'"><a href="{@href}"
-          title="Customise this part of the page">customise area</a></xsl:when>
-<xsl:otherwise><xsl:apply-templates /></xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-
-
-<xsl:template match="bebop:link">
-<a href="{@href}"><xsl:value-of select="bebop:label"/>
-<xsl:apply-templates select="bebop:image"/>
-</a>
-</xsl:template>
-
-
-
-<xsl:template match="bebop:label">
-<xsl:value-of select="."/>
-</xsl:template>
-
-
-
-<xsl:template match="bebop:image">
-<img>
-<xsl:attribute name="alt"><xsl:value-of select="@alt"/></xsl:attribute>
-<xsl:attribute name="src">
-<xsl:call-template name="imagePath">
-<xsl:with-param name="link" select="@src" />
-</xsl:call-template>
-</xsl:attribute>
-</img>
-</xsl:template>
-
-
-
-<xsl:template name="imagePath">
-<xsl:param name="link" />
-<xsl:value-of select="$context-prefix"/><xsl:value-of select="$link"/>
-</xsl:template>
-
-
-
-
-
-
-</xsl:stylesheet>
-<!-- Stylus Studio meta-information - (c)1998-2003. Sonic Software Corporation.
-     All rights reserved.
-<metaInformation>
-<scenarios ><scenario default="yes" name="Scenario2" userelativepaths="yes" 
-    externalpreview="no" url="..\XML\newHomepagePortal.xml"
-    htmlbaseurl="http://194.202.210.43:9005/theme/ibm&#x2D;generic/"
-    outputurl="" processortype="internal" profilemode="0" urlprofilexml=""
-    commandline="" additionalpath="" additionalclasspath=""
-    postprocessortype="none" postprocesscommandline=""
-    postprocessadditionalpath=""
-    postprocessgeneratedext=""/></scenarios><MapperInfo srcSchemaPath=""
-    srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no"
-    destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes"
-    destSchemaInterpretAsXML="no"/>
-</metaInformation>
--->
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/application-directory-portlet.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/application-directory-portlet.xsl
deleted file mode 100644
index d3ec401c9..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/application-directory-portlet.xsl
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 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"
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-	exclude-result-prefixes="xsl admin bebop portal portlet"
-	version="1.0">
-
-
-  
-  <xsl:template match="portlet:applicationDirectory">
-    <xsl:for-each select="portlet:applicationDirectoryEntry">
-        <xsl:apply-templates select="."/>
-		</xsl:for-each>
-  </xsl:template>
-
-  <xsl:template match="portlet:applicationDirectoryEntry">
-    <div>
-      <a href="{@url}">
-        <xsl:value-of select="@title"/>
-      </a>
-      <xsl:value-of select="@description"/>
-    </div>
-  </xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/content-item-portlet.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/content-item-portlet.xsl
deleted file mode 100644
index 5dd4f948d..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/content-item-portlet.xsl
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 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"
-  xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.arsdigita.com/portlet/1.0"
-	exclude-result-prefixes="xsl admin bebop cms portal portlet"
-	version="1.0">
-
-
-
-
-<xsl:template match="portlet:contentItem">
-<xsl:for-each select="./cms:item">
-<div class="CI">
-<h2>
-<a>
-		<xsl:attribute name="href">/redirect/?oid=<xsl:value-of select="@oid"/></xsl:attribute>
-		<xsl:value-of select="title"/>
-</a>
-</h2>
-<xsl:value-of disable-output-escaping="yes" select="./summary"/>
-</div>
-</xsl:for-each>
-</xsl:template>    
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/content-sections-portlet.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/content-sections-portlet.xsl
deleted file mode 100644
index d0c9afd1d..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/content-sections-portlet.xsl
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet  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"
-              xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-             xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-   exclude-result-prefixes="xsl admin bebop portal portlet"
-                   version="1.0">
-
-  <xsl:param name="internal-theme"/>
-
-<xsl:template match="portlet:contentSection">
-  <div>
-    <a href="{@url}index">
-      <xsl:value-of select="@name"/>
-    </a>
-  </div>
-  <div>
-    <a href="{@url}admin/index.jsp">
-      <img border="0" width="11" height="11" alt="admin" src="{$internal-theme}/images/arrow-box.gif"/>
-    </a>
-    <a href="{@url}admin/index.jsp" class="action_link">admin</a>
-  </div>
-</xsl:template>
-
-<xsl:template match="portlet:contentSections">
-  <xsl:for-each select="portlet:contentSection">
-      <div>
-        <xsl:attribute name="class">
-          <xsl:choose>
-            <xsl:when test="position() mod 2">table_row_odd</xsl:when>
-            <xsl:otherwise>table_row_even</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-        <xsl:apply-templates select="."/>
-      </div>
-    </xsl:for-each>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/directory-portlet.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/directory-portlet.xsl
deleted file mode 100644
index 6aab1c230..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/directory-portlet.xsl
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 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"
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-	exclude-result-prefixes="xsl admin bebop portal portlet"
-	version="1.0">
-
-
-<xsl:template match="portlet:contentDirectory">
-  <div id="dirBox">
-	<h2><xsl:value-of select="../@title"/></h2>
-	<xsl:apply-templates />
-	</div>
-</xsl:template>
-
-
-
-
-<xsl:template match="portlet:contentDirectoryEntry" >
-    <div class="dirCat">
-      <div class="directoryEntry"><a class="directoryEntryLink" href="{@url}"><xsl:value-of select="@name" /></a></div>
-      <xsl:for-each select="portlet:contentDirectorySubentry">
-            <a class="directorySubentryLink" href="{@url}"><xsl:value-of select="@name" /></a>
-            <xsl:if test="not(position() = last())">
-              |
-            </xsl:if>
-      </xsl:for-each>
-   </div>
-  </xsl:template>
-
-
-
-
-
-
- 
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/freeform-html-portlet.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/freeform-html-portlet.xsl
deleted file mode 100644
index 317ee6eab..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/freeform-html-portlet.xsl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet 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"
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-	exclude-result-prefixes="xsl admin bebop portal portlet"
-	version="1.0">
-
-<xsl:template match="portlet:freeformHTML">
-  <div>
-    <xsl:value-of select="." disable-output-escaping="yes" />
-  </div>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/lib.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/lib.xsl
deleted file mode 100644
index 7e181bdd4..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/lib.xsl
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 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"
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-	version="1.0">
-
-  <xsl:template match="portlet:simple">
-    <xsl:apply-templates/>
-  </xsl:template>
-  
-  <xsl:template match="portlet:action">
-    <xsl:variable name="title">
-      <xsl:choose>
-        <xsl:when test="@name = 'moveDown'">
-          <xsl:text>Move Down</xsl:text>
-        </xsl:when>
-        <xsl:when test="@name = 'moveUp'">
-          <xsl:text>Move Up</xsl:text>
-        </xsl:when>
-        <xsl:when test="@name = 'customize'">
-          <xsl:text>Configure</xsl:text>
-        </xsl:when>
-        <xsl:when test="@name = 'delete'">
-          <xsl:text>Delete</xsl:text>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:variable>
-    
-    <a href="{@url}" title="{$title}">
-      <img src="{$theme-prefix}/portal/{@name}.gif"  border="1" alt="{$title}"/>
-    </a>
-  </xsl:template>
-  
-  <xsl:template match="portal:portal">
-    <table class="portalWrap" width="100%" cellpadding="0" cellspacing="0" border="0">
-      <tr valign="top">
-        <xsl:apply-templates select="." mode="columns">
-          <xsl:with-param name="format" select="@layout"/>
-        </xsl:apply-templates>
-      </tr>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="bebop:portlet">
-    <div class="portletWrap">
-      <xsl:apply-templates />
-	</div>
-  </xsl:template>
-    
-</xsl:stylesheet>
-
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/login-portlet.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/login-portlet.xsl
deleted file mode 100644
index 3b982ff14..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/login-portlet.xsl
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 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"
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-	exclude-result-prefixes="xsl admin bebop portal portlet"
-	version="1.0">
-
-
-
-<xsl:template match="portlet:login">
-  <div id="loginBox"><xsl:apply-templates /></div>
-</xsl:template>
-
-
-
-<xsl:template match="portlet:loginuser">
-  <h2><xsl:value-of select="../../@title"/></h2>
-  Welcome <b><xsl:value-of select="@givenName"/>&#160;<xsl:value-of select="@familyName"/></b>
-  <ul>
-    <xsl:for-each select="bebop:link">
-      <li><xsl:apply-templates select="."/></li>
-    </xsl:for-each>
-		<li><a href="{$dispatcher-prefix}/register/logout" title="Logout">Logout</a></li>
-  </ul>
-<span class="hide">|</span>
-<div id="registerB"><a title="why register?" href="/whyregister">why register?</a></div>
-
-</xsl:template>
-
-<xsl:template match="portlet:loginform">
-  <h2>Site Login</h2>
-	<xsl:apply-templates />
-  <form method="post" action="{$dispatcher-prefix}/{@url}" name="user-login">
-    <div>Email: <input class="logbx" type="text" size="20" name="email"/></div>
-    <div>Password: <input  class="logbx" type="password" size="20" name="password"/></div>
-    <div><input type="checkbox" checked="checked" name="persistentCookieP" value="1" id="persistentCookieP:1"/>
-          <label for="persistentCookieP:1">Remember this login?</label>
-     </div>
-     <div class="logSubmit"><input class="loggo" type="submit" name="login.submit" value="Login"/></div>
-     <input name="form.user-login" type="hidden" value="visited"/>
-     <input name="timestamp" type="hidden" value="{@timestamp}"/>
-  </form>
-</xsl:template>
- 
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/portlets.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/portlets.xsl
deleted file mode 100644
index 33286b190..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/portlets.xsl
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet  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"
-              xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-             xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-   exclude-result-prefixes="xsl admin bebop portal portlet"
-                   version="1.0">
-
-	
-  <xsl:import href="login-portlet.xsl"/>
-  <xsl:import href="directory-portlet.xsl"/>
-  <xsl:import href="content-sections-portlet.xsl"/>
-  <xsl:import href="time-of-day-portlet.xsl"/>
-  <xsl:import href="freeform-html-portlet.xsl"/>
-  <xsl:import href="rss-feed-portlet.xsl"/>
-  <xsl:import href="tasklist-portlet.xsl"/>
-  <xsl:import href="application-directory-portlet.xsl"/>
-  <xsl:import href="workspace-directory-portlet.xsl"/>
-  <xsl:import href="content-item-portlet.xsl"/>
- 
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/rss-feed-portlet.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/rss-feed-portlet.xsl
deleted file mode 100644
index d2fd5570e..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/rss-feed-portlet.xsl
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 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"
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:rss="http://purl.org/rss/1.0/"
-  xmlns:backslash="http://slashdot.org/backslash.dtd"
-	exclude-result-prefixes="xsl admin bebop portal portlet rdf rss backslash"
-	version="1.0">
-
-  <xsl:template match="portlet:RSSFeed">
-    <div class="RSS">
-	<h2><xsl:value-of select="../@title"/></h2>
-	<xsl:apply-templates select="rdf:RDF"/>
-    <xsl:apply-templates select="rss:rss"/>
-    <xsl:apply-templates select="rss"/>
-    <xsl:apply-templates select="portlet:RSSFeedError"/>
-	</div>
-  </xsl:template>
-
-  <xsl:template match="portlet:RSSFeedError">
-    <div>
-      <xsl:value-of select="." disable-output-escaping="no"/>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="rss">
-    <xsl:param name="maxItems" select="10"/>
-    <xsl:apply-templates select="channel">
-      <xsl:with-param name="maxItems" select="$maxItems"/>
-    </xsl:apply-templates>
-  </xsl:template>
-  
-  <xsl:template match="rss:rss">
-    <xsl:param name="maxItems" select="10"/>
-    <xsl:apply-templates select="rss:channel">
-      <xsl:with-param name="maxItems" select="$maxItems"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <xsl:template match="rdf:RDF">
-    <xsl:param name="maxItems" select="10"/>
-    <xsl:apply-templates select="rss:channel" />
-    <xsl:for-each select="rss:item[$maxItems > position()]">
-      <dl>
-        <xsl:apply-templates select="."/>
-      </dl>
-    </xsl:for-each>
-  </xsl:template>
-  
-  <xsl:template match="rss:channel">
-    <xsl:param name="maxItems" select="10"/>
-    <a><xsl:attribute name="href"><xsl:value-of select="rss:link"/></xsl:attribute><xsl:value-of select="rss:title"/></a>
-    <!-- backwards compatability with old rss format -->
-    <xsl:for-each select="rss:item[$maxItems > position()]">
-      <dl>
-        <xsl:apply-templates select="."/>
-      </dl>
-    </xsl:for-each>
-  </xsl:template>
-    
-  <xsl:template match="rss:item">
-    <dt>
-        <a><xsl:attribute name="href"><xsl:value-of select="rss:link"/></xsl:attribute><xsl:value-of select="rss:title"/></a>
-    </dt>
-    <dd>
-      <xsl:value-of select="rss:description"/>
-    </dd>
-  </xsl:template>
-  
-  
-  <xsl:template match="channel">
-    <xsl:param name="maxItems" select="10"/>
-    <a><xsl:attribute name="href"><xsl:value-of select="link"/></xsl:attribute><xsl:value-of select="title"/></a>
-    <!-- backwards compatability with old rss format -->
-    <xsl:for-each select="item[$maxItems > position()]">
-      <dl>
-        <xsl:apply-templates select="."/>
-      </dl>
-    </xsl:for-each>
-  </xsl:template>
-    
-  <xsl:template match="item">
-    <dt>
-        <a><xsl:attribute name="href"><xsl:value-of select="link"/></xsl:attribute><xsl:value-of select="title"/></a>
-    </dt>
-    <dd>
-      <xsl:value-of select="description"/>
-    </dd>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/tasklist-portlet.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/tasklist-portlet.xsl
deleted file mode 100644
index 720efab26..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/tasklist-portlet.xsl
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 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"
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-	exclude-result-prefixes="xsl admin bebop portal portlet"
-	version="1.0">
-
-
-<xsl:template match="portlet:taskListTask">
-  <div>
-    <a href="{@summaryURL}">
-      <xsl:value-of select="@pageTitle"/>
-    </a>
-  </div>
-  <div>
-    <a href="{@authoringURL}">
-      <xsl:value-of select="@taskType"/>
-    </a>
-  </div>
-  <div>
-    <xsl:value-of select="@dueDate"/>
-  </div>
-  <div>
-    <xsl:value-of select="@isLocked"/>,
-    <xsl:if test="@assigneeCount='0'">
-        No assigned users
-    </xsl:if>
-    <xsl:if test="@assigneeCount='1'">
-        1 assigned user
-    </xsl:if>
-    <xsl:if test="@assigneeCount>'1'">
-        <xsl:value-of select="@assigneeCount"/> assigned users
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="portlet:taskList">
-  <xsl:if test="count(portlet:taskListTask)='0'">
-    <p>No tasks to display.</p>
-  </xsl:if>
-  <xsl:if test="count(portlet:taskListTask)>'0'">
-  <table cellpadding="2" cellspacing="2" border="0">
-    <tr><td>Item Title</td><td>Action</td><td>Due Date</td><td>Status</td></tr>
-    <xsl:for-each select="portlet:taskListTask">
-      <tr>
-        <xsl:attribute name="class">
-          <xsl:choose>
-            <xsl:when test="position() mod 2">table_row_odd</xsl:when>
-            <xsl:otherwise>table_row_even</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-        <xsl:apply-templates select="."/>
-      </tr>
-    </xsl:for-each>
-  </table>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/time-of-day-portlet.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/time-of-day-portlet.xsl
deleted file mode 100644
index 35c7398c9..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/time-of-day-portlet.xsl
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet  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"
-              xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-             xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-   exclude-result-prefixes="xsl admin bebop portal portlet"
-                   version="1.0">
-
-<xsl:template match="portlet:timeOfDay">
-  <xsl:value-of select="@date"/>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/workspace-directory-portlet.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/workspace-directory-portlet.xsl
deleted file mode 100644
index 1e533ace5..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/portal/workspace-directory-portlet.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:admin="http://www.arsdigita.com/admin-ui/1.0"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-	exclude-result-prefixes="xsl admin bebop portal portlet"
-	version="1.0">
-
-
-  <xsl:template match="portlet:workspaceDirectory">
-    <xsl:apply-templates select="*"/>
-  </xsl:template>
-
-  <xsl:template match="portal:workspaceDirectory">
-    <xsl:apply-templates select="*">
-      <xsl:with-param name="maxItems" select="100"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/search-admin.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/search-admin.xsl
deleted file mode 100644
index 9dbf624ce..000000000
--- a/ccm-sci-bundle/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/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/themes/heirloom/apps/search/xsl/index.xsl"/>
-  -->
-  <!-- path to xsl if installed in the main (common) web context   
-         -->
-  <xsl:import href="../../../themes/heirloom/apps/search/xsl/index.xsl"/>
- 
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/search-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/search-index.xsl
deleted file mode 100644
index e99b1915f..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/search-index.xsl
+++ /dev/null
@@ -1,591 +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/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/themes/heirloom/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="../../../themes/heirloom/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-sci-bundle/web/themes/static/aplaws-generic/shortcuts-index.css b/ccm-sci-bundle/web/themes/static/aplaws-generic/shortcuts-index.css
deleted file mode 100644
index 8b66ce665..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/shortcuts-index.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url(/themes/heirloom/css/acs-master.css);
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/shortcuts-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/shortcuts-index.xsl
deleted file mode 100644
index 5eed7c16a..000000000
--- a/ccm-sci-bundle/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/themes/heirloom/apps/shortcuts/xsl/index.xsl"/>
-  -->
-  <!-- path to xsl if installed in the main (common) web context   
-  -->
-  <xsl:import href="../../heirloom/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-sci-bundle/web/themes/static/aplaws-generic/subsite-index.css b/ccm-sci-bundle/web/themes/static/aplaws-generic/subsite-index.css
deleted file mode 100644
index 8b66ce665..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/subsite-index.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url(/themes/heirloom/css/acs-master.css);
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/subsite-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/subsite-index.xsl
deleted file mode 100644
index ecc001850..000000000
--- a/ccm-sci-bundle/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/themes/heirloom/apps/subsite/xsl/index.xsl"/>
-  -->
-  <!-- path to xsl if installed in the main (common) web context   
-  -->
-  <xsl:import href="../../heirloom/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-sci-bundle/web/themes/static/aplaws-generic/terms-index.css b/ccm-sci-bundle/web/themes/static/aplaws-generic/terms-index.css
deleted file mode 100644
index fad9728a2..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/terms-index.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@import url(../../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/themes/heirloom/apps/terms/xsl/index.css); */
-/* import if installed in the main (common) web context          */
-@import url(../../heirloom/apps/terms/xsl/index.css); 
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/terms-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/terms-index.xsl
deleted file mode 100644
index f8a9db728..000000000
--- a/ccm-sci-bundle/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/themes/heirloom/apps/terms/xsl/index.xsl"/>
-  -->
-  <!-- path to xsl if installed in the main (common) web context   
-  -->
-  <xsl:import href="../../heirloom/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-sci-bundle/web/themes/static/aplaws-generic/theme-index.css b/ccm-sci-bundle/web/themes/static/aplaws-generic/theme-index.css
deleted file mode 100644
index 8b66ce665..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/theme-index.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url(/themes/heirloom/css/acs-master.css);
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/theme-index.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/theme-index.xsl
deleted file mode 100644
index ffa4f5003..000000000
--- a/ccm-sci-bundle/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/themes/heirloom/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-sci-bundle/web/themes/static/aplaws-generic/types/Agenda.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Agenda.xsl
deleted file mode 100644
index 17c62d363..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Agenda.xsl
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                exclude-result-prefixes="xsl bebop cms"
-version="1.0">
-
-
-
-<xsl:template name="CT_Agenda_graphics">
-<div id="details">
-<p>
-<span class="bold">Date:</span><xsl:value-of disable-output-escaping="yes" select="./agendaDate"/>
-</p>
-<p>
-<span class="bold">Location:</span><xsl:value-of disable-output-escaping="yes" select="./location"/>
-</p>
-<p>
-<span class="bold">Attendees:</span><xsl:value-of disable-output-escaping="yes" select="./attendees"/>
-</p>
-<p>
-<span class="bold">Contact Info:</span><xsl:value-of disable-output-escaping="yes" select="./contactInfo"/>
-</p>
-</div>
-
-<div id="mainBody">
-<p> 
-<span class="bold">Subject Items: </span>
-<xsl:value-of disable-output-escaping="yes" select="./subjectItems"/>
-</p>
-<p> 
-<span class="bold">Summary: </span>
-<xsl:value-of disable-output-escaping="yes" select="./summary"/>
-</p>
-<xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
-</div>
-</xsl:template>
-
-
-
-
-<xsl:template name="agendaDate">
-<xsl:param name="date" />
-<xsl:choose>
-<xsl:when test="not(boolean($date))">
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-</xsl:when>
-</xsl:choose>
-<xsl:choose>
-<xsl:when test="boolean($date)">
-<xsl:variable name="day" select="substring($date, 1, 3)"/>
-<xsl:choose>
-<xsl:when test="$day='Mon'">Mon</xsl:when>
-<xsl:when test="$day='Tue'">Tue</xsl:when>
-<xsl:when test="$day='Wed'">Wed</xsl:when>
-<xsl:when test="$day='Thu'">Thu</xsl:when>
-<xsl:when test="$day='Fri'">Fri</xsl:when>
-<xsl:when test="$day='Sat'">Sat</xsl:when>
-<xsl:when test="$day='Sun'">Sun</xsl:when>
-<xsl:otherwise />
-</xsl:choose>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-<xsl:value-of select="number(substring($date, 9, 2))" />
-<xsl:choose>
-<xsl:when test="number(substring($date, 9, 2))='1'">st</xsl:when>
-<xsl:when test="number(substring($date, 9, 2))='2'">nd</xsl:when>
-<xsl:when test="number(substring($date, 9, 2))='3'">rd</xsl:when>
-<xsl:otherwise>th</xsl:otherwise>
-</xsl:choose>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-<xsl:variable name="month" select="substring($date, 5, 3)"/>
-<xsl:choose>
-<xsl:when test="$month='Jan'">Jan</xsl:when>
-<xsl:when test="$month='Feb'">Feb</xsl:when>
-<xsl:when test="$month='Mar'">Mar</xsl:when>
-<xsl:when test="$month='Apr'">Apr</xsl:when>
-<xsl:when test="$month='May'">May</xsl:when>
-<xsl:when test="$month='Jun'">Jun</xsl:when>
-<xsl:when test="$month='Jul'">Jul</xsl:when>
-<xsl:when test="$month='Aug'">Aug</xsl:when>
-<xsl:when test="$month='Sep'">Sep</xsl:when>
-<xsl:when test="$month='Oct'">Oct</xsl:when>
-<xsl:when test="$month='Nov'">Nov</xsl:when>
-<xsl:when test="$month='Dec'">Dec</xsl:when>
-<xsl:otherwise />
-</xsl:choose>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-20<xsl:value-of select="substring($date, 27, 2)" />
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-<xsl:value-of select="substring($date, 12, 5)" />
-</xsl:when>
-</xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Article.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Article.xsl
deleted file mode 100644
index 5053ca2d6..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Article.xsl
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                exclude-result-prefixes="xsl bebop cms"
-version="1.0">
-
-
-
-<xsl:template name="CT_Article_graphics">
-
-<div id="greeting">
-<xsl:for-each select="./imageCaptions">		
-<div id="R_image">
-<img align="top">
-<xsl:attribute name="src"><xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/?image_id=<xsl:value-of select="imageAsset/id" /></xsl:attribute>
-<xsl:attribute name="alt"><xsl:value-of select="caption" /></xsl:attribute>
-</img>
-</div>
-</xsl:for-each>
-
-<div id="lead">
-	<xsl:value-of disable-output-escaping="yes" select="./lead"/>
-</div>
-
-</div>
-<div id="mainBody">
-	<xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
-</div>
-
-</xsl:template>
-</xsl:stylesheet>
-
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/ContentTypes.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/ContentTypes.xsl
deleted file mode 100644
index 8b3c97dfe..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/ContentTypes.xsl
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-              xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  exclude-result-prefixes="xsl bebop cms"
-                  version="1.0">
-
-
-
-<xsl:import href="/themes/servlet/content-type/index.xsl"/>
-<xsl:import href="Article.xsl"/>
-<xsl:import href="MultiPartArticle.xsl"/>
-<xsl:import href="FileStorageItem.xsl"/>
-<xsl:import href="Event.xsl"/>
-<xsl:import href="Agenda.xsl"/>
-<xsl:import href="InlineSite.xsl"/>
-<xsl:import href="Job.xsl"/>
-<xsl:import href="LegalNotice.xsl"/>
-<xsl:import href="Minutes.xsl"/>
-<xsl:import href="NewsItem.xsl"/>
-<xsl:import href="PressRelease.xsl"/>
-<xsl:import href="Service.xsl"/>
-<xsl:import href="SimpleAddress.xsl"/>
-<xsl:import href="SiteProxy.xsl"/>
-
-
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Article' and not(@useContext = 'itemAdminSummary')]">
-<xsl:call-template name="CT_Article_graphics"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.MultiPartArticle' and not(@useContext = 'itemAdminSummary')]">
-<xsl:call-template name="CT_MultiPartArticle_graphics"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.FileStorageItem' and not(@useContext = 'itemAdminSummary')]">
-<xsl:call-template name="CT_FileStorageItem_graphics"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Event' and not(@useContext = 'itemAdminSummary')]">
-<xsl:call-template name="CT_Event_graphics"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SimpleAddress' and not(@useContext = 'itemAdminSummary')]">
-<xsl:call-template name="CT_SimpleAddress_graphics"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Agenda' and not(@useContext = 'itemAdminSummary')]">
-<xsl:call-template name="CT_Agenda_graphics"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Job' and not(@useContext = 'itemAdminSummary')]">
-<xsl:call-template name="CT_Job_graphics"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.LegalNotice' and not(@useContext = 'itemAdminSummary')]">
-<xsl:call-template name="CT_LegalNotice_graphics"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Minutes' and not(@useContext = 'itemAdminSummary')]">
-<xsl:call-template name="CT_Minutes_graphics"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.Service' and not(@useContext = 'itemAdminSummary')]">
-<xsl:call-template name="CT_Service_graphics"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.PressRelease' and not(@useContext = 'itemAdminSummary')]">
-<xsl:call-template name="CT_PressRelease_graphics"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.NewsItem' and not(@useContext = 'itemAdminSummary')]">
-<xsl:call-template name="CT_NewsItem_graphics"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.InlineSite']">
-<xsl:call-template name="CT_InlineSite"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.ESDService']">
-<xsl:apply-templates select="." mode="cms:CT_graphics"/>
-</xsl:template>
-<xsl:template match="cms:item[objectType='com.arsdigita.cms.contenttypes.SiteProxy']">
-<xsl:apply-templates select="." mode="cms:CT_graphics"/>
-</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Event.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Event.xsl
deleted file mode 100644
index 9a25fec03..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Event.xsl
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-		xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-		xmlns:cms="http://www.arsdigita.com/cms/1.0"
-		exclude-result-prefixes="xsl bebop cms"
-		version="1.0">		
-
-
-<xsl:template name="CT_Event_graphics">
-<div id="details">
-<p>
-<span class="bold">Event Type:</span><xsl:value-of disable-output-escaping="yes" select="./eventType"/>
-</p>
-<p>
-<span class="bold">Event Date:</span>
-<xsl:value-of disable-output-escaping="yes" select="./eventDate"/>
-</p>
-<p>
-<span class="bold">Start Date:</span>
-<xsl:value-of disable-output-escaping="yes" select="./startDate"/>
-</p>
-<p>
-<span class="bold">Start Time:</span>
-<xsl:value-of disable-output-escaping="yes" select="./startTime"/>
-</p>
-<p>
-<span class="bold">End Date:</span>
-<xsl:value-of disable-output-escaping="yes" select="./endDate"/>
-</p>
-<p>
-<span class="bold">End Time:</span>
-<xsl:value-of disable-output-escaping="yes" select="./endTime"/>
-</p>
-<p>
-<span class="bold">Contributor:</span><xsl:value-of disable-output-escaping="yes" select="./mainContributor"/>
-</p>
-<p>
-<span class="bold">Location:</span><xsl:value-of disable-output-escaping="yes" select="./location"/>
-</p>
-<p>
-<span class="bold">Map:</span>
-<a class="CIDetail" href="{./mapLink}">
-View map
-</a>
-</p>
-<p>
-<span class="bold">Cost:</span><xsl:value-of disable-output-escaping="yes" select="./cost"/>
-</p>
-</div>
-<div id="mainBody">
-<p class="bold">
-<xsl:value-of disable-output-escaping="yes" select="./lead"/>
-</p>
-<xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
-</div>
-</xsl:template>   
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/FileStorageItem.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/FileStorageItem.xsl
deleted file mode 100644
index af6319ba7..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/FileStorageItem.xsl
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                exclude-result-prefixes="xsl bebop cms"
-version="1.0">
-
-
-
-
-<xsl:template name="CT_FileStorageItem_graphics">
-
-<div id="mainBody">
-<xsl:value-of disable-output-escaping="yes" select="./description"/>
-</div>
-
-<div id="sectionList">		
-<a href="{$dispatcher-prefix}/cms-service/stream/asset/?asset_id={./file/id}">View in browser</a>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;
-<a href="{$dispatcher-prefix}/cms-service/download/asset/?asset_id={./file/id}">Save to disk</a>
-</div>
-
-</xsl:template>
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/InlineSite.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/InlineSite.xsl
deleted file mode 100644
index e87f28ef8..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/InlineSite.xsl
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet 
-		xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-		xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-		xmlns:cms="http://www.arsdigita.com/cms/1.0"
-		exclude-result-prefixes="xsl bebop cms"
-		version="1.0">
-
-
-
-
-<xsl:template name="CT_InlineSite">
-<iframe>
-	<xsl:attribute name="noresize" />
-	<xsl:attribute name="frameborder">0</xsl:attribute>
-	<xsl:attribute name="name">content</xsl:attribute>
-	<xsl:attribute name="width">100%</xsl:attribute>
-	<xsl:attribute name="height">400</xsl:attribute>
-	<xsl:attribute name="scrolling">yes</xsl:attribute>
-	<xsl:attribute name="src"><xsl:value-of select="./url"/></xsl:attribute>
-</iframe>
-</xsl:template>
-
-
-</xsl:stylesheet>
-
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Job.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Job.xsl
deleted file mode 100644
index b6e1c034d..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Job.xsl
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                exclude-result-prefixes="xsl bebop cms"
-version="1.0">
-
- 
-
-<xsl:template name="CT_Job_graphics">
-<div id="details">	
-<p>
-<span class="bold">Grade:</span><xsl:value-of disable-output-escaping="yes" select="./grade"/>
-</p>
-<p>
-<span class="bold">Department:</span><xsl:value-of disable-output-escaping="yes" select="./department"/>
-</p>
-<p>
-<span class="bold">Salary:</span><xsl:value-of disable-output-escaping="yes" select="./salary"/>
-</p>
-<p>
-<span class="bold">Ref:</span><xsl:value-of disable-output-escaping="yes" select="./refNumber"/>
-</p>
-<p>
-<span class="bold">Closing Date:</span><xsl:value-of disable-output-escaping="yes" select="./closingDate"/>
-</p>
-<p>
-<span class="bold">Contact:</span><xsl:value-of disable-output-escaping="yes" select="./contactDetails"/>
-</p>
-</div>
-<div id="mainBody">
-<p> 
-<span class="bold">Job Description: </span>
-<xsl:value-of disable-output-escaping="yes" select="./jobDescription"/>
-</p>
-<p> 
-<span class="bold">Person Specification: </span>
-<xsl:value-of disable-output-escaping="yes" select="./personSpecification"/>
-</p>
-<xsl:value-of disable-output-escaping="yes" select="./body"/>
-</div>
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/LegalNotice.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/LegalNotice.xsl
deleted file mode 100644
index 4a6bfe587..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/LegalNotice.xsl
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                exclude-result-prefixes="xsl bebop cms"
-version="1.0">
-
-
-
-<xsl:template name="CT_LegalNotice_graphics">
-<div id="details">
-<p>
-<span class="bold">UID:</span><xsl:value-of disable-output-escaping="yes" select="./governmentUID"/>
-</p>
-</div>
-<div id="mainBody">
-<xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
-</div>
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Minutes.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Minutes.xsl
deleted file mode 100644
index 43360a7ae..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Minutes.xsl
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                exclude-result-prefixes="xsl bebop cms"
-version="1.0">
-
-
-<xsl:template name="CT_Minutes_graphics">
-<div id="details">
-<p>
-<span class="bold">Description of Minutes:</span><xsl:value-of disable-output-escaping="yes" select="./description"/>
-</p>
-<p>
-<span class="bold">Minutes ID Number:</span><xsl:value-of disable-output-escaping="yes" select="./minuteNumber" />
-</p>
-<p>
-<span class="bold">Attendees At Meeting:</span><xsl:value-of disable-output-escaping="yes" select="./attendees"/>
-</p>			
-</div>
-<div id="mainBody">
-<p class="bold">
-<xsl:value-of disable-output-escaping="yes" select="./descriptionOfMinutes"/>
-</p>
-<p>
-<span class="bold">Action Item: </span><xsl:value-of disable-output-escaping="yes" select="./actionItem"/>
-</p>
-<xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
-</div>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl
deleted file mode 100644
index 8ac049b4d..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                xmlns:ui="http://www.arsdigita.com/ui/1.0"
-                xmlns:nav="http://ccm.redhat.com/navigation"
-                exclude-result-prefixes="xsl bebop cms ui"
-                version="1.0">
-  
-  <xsl:template name="CT_MultiPartArticle_graphics">    
-
-    <div id="greeting">
-      <div id="leadDetails">
-        <xsl:value-of disable-output-escaping="yes" select="./summary"/>
-      </div>
-    </div>
-    
-    <span class="hide">|</span>
-	
-    <div id="sectionList">	
-	
-      <span class="bold">Sections:</span>
-	
-      <xsl:for-each select="./sections">
-        <xsl:sort select="./rank" data-type="number"/>
-  
-        <xsl:variable name="currentRank" select="./rank"/>
-        <xsl:variable name="prevRank" select="number($currentRank -1)"/>
-        <xsl:variable name="Page" select="count(../sections[./pageBreak ='true' and ./rank &lt; $currentRank]) + 1"/>
-        <xsl:variable name="prevPage" select="count(../sections[./pageBreak ='true' and ./rank &lt; $prevRank]) + 1"/>
-        <xsl:variable name="internalRank" select="count(../sections[./pageBreak ='false' and ./rank &lt; $currentRank]) + 1"/>
-  
-        <xsl:choose>
-          <xsl:when test="@oid = ../../../cms:articleSectionPanel/cms:item[position() = 1]/@oid">
-            <xsl:value-of select="title"/>
-          </xsl:when>
-          <xsl:when test="@oid = ../../../cms:articleSectionPanel/cms:item[position() != 1]/@oid">
-            <a>
-              <xsl:attribute name="href">#internalSection<xsl:value-of select="$internalRank" /></xsl:attribute>
-              <xsl:attribute name="title">internal section <xsl:value-of select="$internalRank" /></xsl:attribute>
-              <xsl:value-of select="title"/>
-            </a>
-          </xsl:when>
-          <xsl:when test="@oid = ../../../nav:greetingItemExtraXML/cms:articleSectionPanel/cms:item[position() = 1]/@oid">
-            <xsl:value-of select="title"/>
-          </xsl:when>
-          <xsl:when test="@oid = ../../../nav:greetingItemExtraXML/cms:articleSectionPanel/cms:item[position() != 1]/@oid">
-            <a>
-              <xsl:attribute name="href">#internalSection<xsl:value-of select="$internalRank" /></xsl:attribute>
-              <xsl:attribute name="title">internal section <xsl:value-of select="$internalRank" /></xsl:attribute>
-              <xsl:value-of select="title"/>
-            </a>
-          </xsl:when>
-          <xsl:when test="($Page = $prevPage) and $Page!='1'">
-            <a>
-              <xsl:attribute name="href">?page=<xsl:value-of select="$Page" />#internalSection<xsl:value-of select="$internalRank" /></xsl:attribute>
-              <xsl:attribute name="title">page<xsl:value-of select="$Page" />internal section <xsl:value-of select="$internalRank" /></xsl:attribute>
-              <xsl:value-of select="title"/>
-            </a>
-          </xsl:when>
-          <xsl:otherwise>
-            <a href="?page={$Page}" title="page{$Page}">
-              <xsl:value-of select="title"/>
-            </a>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:if test="not(position()=last())"><xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;|<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;</xsl:if>
-      </xsl:for-each>
-      
-    </div>
-
-    <xsl:for-each select="/bebop:page/cms:articleSectionPanel/cms:item">
-      <xsl:call-template name="oneSection" />
-    </xsl:for-each>
-      
-    <xsl:for-each select="/bebop:page/nav:greetingItemExtraXML/cms:articleSectionPanel/cms:item">
-      <xsl:call-template name="oneSection" />
-    </xsl:for-each>
-      
-    <div id="mpaDirection">
-      
-      <xsl:for-each select="./sections">
-        <xsl:sort select="./rank"/>
-        
-        <xsl:variable name="currentRank" select="./rank"/>
-        <xsl:variable name="Page" select="count(../sections[./pageBreak ='true' and ./rank &lt; $currentRank]) + 1"/>
-        <xsl:variable name="internalRank" select="count(../sections[./pageBreak ='false' and ./rank &lt; $currentRank]) + 1"/>
-        
-        <xsl:choose>
-			<xsl:when test="@oid = ../../../cms:articleSectionPanel/cms:item[position() = 1]/@oid">
-              
-              <xsl:if test="position() !='1'">
-                <a class="prev" href="?page={$Page -1}" title="previous page">
-                  Previous page
-                </a>
-              </xsl:if>
-              | 
-              <xsl:if test="(number(rank))!=(count(../sections))">
-                <a class="next" href="?page={$Page +1}" title="next page">
-                  Next page
-                </a>
-              </xsl:if>
-            </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-      
-    </div>
-    
-  </xsl:template>
-  
-
-
-  <xsl:template name="oneSection">
-
-    <div class="section">
-      <xsl:for-each select="image">
-        
-        <img align="right">
-          <xsl:attribute name="src"><xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/?image_id=<xsl:value-of select="id" /></xsl:attribute>
-          <xsl:attribute name="alt"><xsl:value-of select="description" /></xsl:attribute>
-          <xsl:attribute name="width"><xsl:value-of select="width" /></xsl:attribute>
-          <xsl:attribute name="height"><xsl:value-of select="height" /></xsl:attribute>
-        </img>
-      </xsl:for-each>
-      
-      <xsl:choose>
-        <xsl:when test="position() =1">
-          <div class="bold"><xsl:value-of disable-output-escaping="yes" select="title"/>:</div>
-        </xsl:when>
-        <xsl:otherwise>
-          <div class="bold">
-            <a  class="intLink">
-              <xsl:attribute name="name">internalSection<xsl:value-of select="position()" /></xsl:attribute>
-            </a>
-          <xsl:value-of disable-output-escaping="yes" select="title"/>:</div>
-          <div class="top"><xsl:text>[</xsl:text><a href="#top" class="topLink" title="top of page">top of page</a><xsl:text>]</xsl:text></div>
-        </xsl:otherwise>
-        </xsl:choose>
-        
-        <xsl:for-each select="text">
-          <xsl:value-of disable-output-escaping="yes" select="content"/>
-        </xsl:for-each>
-        
-    </div>
-    
-  </xsl:template>
-  
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/NewsItem.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/NewsItem.xsl
deleted file mode 100644
index 8a7030c51..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/NewsItem.xsl
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-		xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-		xmlns:cms="http://www.arsdigita.com/cms/1.0"
-		exclude-result-prefixes="xsl bebop cms"
-		version="1.0">
-
-
-
-<xsl:template name="CT_NewsItem_graphics">
-<div id="greeting">
-
-<div id="newsDate">
-<xsl:value-of disable-output-escaping="yes" select="./newsDate"/>
-</div>
-
-<xsl:for-each select="./imageCaptions">		
-<div id="R_image">
-<img align="top">
-<xsl:attribute name="src"><xsl:value-of select="$dispatcher-prefix"/>/cms-service/stream/image/?image_id=<xsl:value-of select="imageAsset/id" /></xsl:attribute>
-<xsl:attribute name="alt"><xsl:value-of select="caption" /></xsl:attribute>
-</img>
-<div class="caption"><xsl:value-of select="caption"/></div>
-</div>
-</xsl:for-each>
-	
-<div id="lead">
-			<xsl:value-of disable-output-escaping="yes" select="./lead"/>
-</div>
-</div>
-
-<div id="mainBody">
-			<xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
-</div>
-</xsl:template>
-
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/PressRelease.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/PressRelease.xsl
deleted file mode 100644
index a25dd2dc5..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/PressRelease.xsl
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-		xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-		xmlns:cms="http://www.arsdigita.com/cms/1.0"
-		exclude-result-prefixes="xsl bebop cms"
-		version="1.0">
-
- 
-<xsl:template name="CT_PressRelease_graphics">
-<div id="details">
-<p>
-<span class="bold">Ref Code:</span><xsl:value-of disable-output-escaping="yes" select="./referenceCode"/>
-</p>
-<p>
-<span class="bold">Contact:</span><xsl:value-of disable-output-escaping="yes" select="./contactInfo"/>
-</p>
-</div>
-
-<div id="mainBody">
-<p class="bold"><xsl:value-of disable-output-escaping="yes" select="./summary"/>
-</p>
-<xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
-</div>
-
-</xsl:template>
-  
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Service.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Service.xsl
deleted file mode 100644
index 2758df8a3..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/Service.xsl
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-		xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-		xmlns:cms="http://www.arsdigita.com/cms/1.0"
-		exclude-result-prefixes="xsl bebop cms"
-		version="1.0">
-
-
-
-<xsl:template name="CT_Service_graphics">
-<div id="details">
-<p>
-<span class="bold">Opening Times:</span><xsl:value-of disable-output-escaping="yes" select="./openingTimes"/>
-</p>
-<p>
-<span class="bold">Contact:</span><xsl:value-of disable-output-escaping="yes" select="./contacts"/>
-</p>
-<p>
-<span class="bold">Address:</span><xsl:value-of disable-output-escaping="yes" select="./address"/>
-</p>
-</div>
-
-<div id="mainBody">
-<p> 
-<span class="bold">Services Provided: </span>
-<xsl:value-of disable-output-escaping="yes" select="./servicesProvided"/>
-</p>
-<p> 
-<span class="bold">Summary: </span>
-<xsl:value-of disable-output-escaping="yes" select="./summary"/>
-</p>
-<xsl:value-of disable-output-escaping="yes" select="./body"/>
-</div>
-
-</xsl:template>
-  
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/SimpleAddress.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/SimpleAddress.xsl
deleted file mode 100644
index fc7885c6f..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/SimpleAddress.xsl
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                exclude-result-prefixes="xsl bebop cms"
-version="1.0">
-
-
-
-
-<xsl:template name="CT_SimpleAddress_graphics">
-<div id="details">
-<xsl:if test="./address">
-<p>
-<span class="bold">Address:</span><xsl:value-of disable-output-escaping="yes" select="./address"/>
-</p>
-</xsl:if>
-<xsl:if test="./postalCode">
-<p>
-<span class="bold">Post Code:</span><xsl:value-of disable-output-escaping="yes" select="./postalCode"/>
-</p>
-</xsl:if>
-<xsl:if test="./isoCountryCode/countryName">
-<p>
-<span class="bold">Country:</span><xsl:value-of disable-output-escaping="yes" select="./isoCountryCode/countryName"/>
-</p>
-</xsl:if>
-<xsl:if test="./phone">
-<p>
-<span class="bold">Phone:</span><xsl:value-of disable-output-escaping="yes" select="./phone"/>
-</p>
-</xsl:if>
-<xsl:if test="./mobile">
-<p>
-<span class="bold">Mobile:</span><xsl:value-of disable-output-escaping="yes" select="./mobile"/>
-</p>
-</xsl:if>
-<xsl:if test="./fax">
-<p>
-<span class="bold">Fax:</span><xsl:value-of disable-output-escaping="yes" select="./fax"/>
-</p>
-</xsl:if>
-<xsl:if test="./email">
-<p>
-<span class="bold">Email:</span><xsl:value-of disable-output-escaping="yes" select="./email"/>
-</p>
-</xsl:if>
-<xsl:if test="./notes">
-<p>
-<span class="bold">Notes:</span><xsl:value-of disable-output-escaping="yes" select="./notes"/>
-</p>
-</xsl:if>
-</div>
-
-
-<div id="mainBody">
-<p class="bold">
-<xsl:value-of disable-output-escaping="yes" select="./lead"/>
-</p>
-<xsl:value-of disable-output-escaping="yes" select="./textAsset/content"/>
-</div>
-
-</xsl:template>
-</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/SiteProxy.xsl b/ccm-sci-bundle/web/themes/static/aplaws-generic/types/SiteProxy.xsl
deleted file mode 100644
index bbbb5c6ac..000000000
--- a/ccm-sci-bundle/web/themes/static/aplaws-generic/types/SiteProxy.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE stylesheet [
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                xmlns:cms="http://www.arsdigita.com/cms/1.0"
-                xmlns:ui="http://www.arsdigita.com/ui/1.0"
-                xmlns:nav="http://ccm.redhat.com/navigation"
-                exclude-result-prefixes="xsl bebop cms ui"
-                version="1.0">
-  
-  <xsl:template name="CT_SiteProxy_graphics">    
-
-    <!-- as an item, or as an index item on a category page -->
-    <xsl:value-of select="../../cms:contentPanel/cms:siteProxyPanel" disable-output-escaping="yes" />
-    <xsl:value-of select="../../nav:greetingItemExtraXML/cms:siteProxyPanel" disable-output-escaping="yes" />
-
-  </xsl:template>
-  
-</xsl:stylesheet>
\ No newline at end of file