diff --git a/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ccm-bookmarks-6.3.0-pdl.jar b/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ccm-bookmarks-6.3.0-pdl.jar
deleted file mode 100755
index a1022c61d..000000000
Binary files a/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ccm-bookmarks-6.3.0-pdl.jar and /dev/null differ
diff --git a/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ccm-bookmarks-6.3.0-sql.jar b/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ccm-bookmarks-6.3.0-sql.jar
deleted file mode 100755
index b29c2f282..000000000
Binary files a/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ccm-bookmarks-6.3.0-sql.jar and /dev/null differ
diff --git a/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ccm-bookmarks-6.3.0.jar b/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ccm-bookmarks-6.3.0.jar
deleted file mode 100755
index 56386222d..000000000
Binary files a/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/ccm-bookmarks-6.3.0.jar and /dev/null differ
diff --git a/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/__ccm__/apps/bookmarks/xsl/index.xsl b/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/__ccm__/apps/bookmarks/xsl/index.xsl
deleted file mode 100755
index a0cd112c8..000000000
--- a/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/__ccm__/apps/bookmarks/xsl/index.xsl
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0">
-  
-<!--
-  <xsl:import href="../../../../packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../../packages/ui/xsl/ui.xsl"/>
--->
-
-  <xsl:import href="../../../../packages/bookmarks/xsl/bookmarks.xsl"/> 
-  
-</xsl:stylesheet>
diff --git a/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/packages/bookmarks/xsl/bookmarks-portlet.xsl b/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/packages/bookmarks/xsl/bookmarks-portlet.xsl
deleted file mode 100755
index fb73087df..000000000
--- a/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/packages/bookmarks/xsl/bookmarks-portlet.xsl
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:forum="http://www.arsdigita.com/forum/1.0"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-  version="1.0">
-
-  <xsl:output method="html"/>
-
-  <xsl:template match="bebop:portlet[@bebop:classname='com.arsdigita.bookmarks.ui.BookmarkPortletRenderer' and count(portlet:action)=0]">
-    <table width="100%" border="0" cellspacing="2" cellpadding="0">
-      <tr>
-        <td bgcolor="#cccccc">
-          <table width="100%" cellspacing="2" cellpadding="4" border="0">
-            <tr>
-              <th class="split_pane_header" width="100%">
-                <xsl:value-of select="@title"/>
-              </th>
-            </tr>
-            <tr>
-              <td class="table_cell" bgcolor="#ffffff" colspan="20">
-                <xsl:apply-templates select="*"/>
-              </td>
-            </tr>
-            <tr>
-              <td class="table_cell" bgcolor="#eeeeee" colspan="20">
-                <xsl:for-each select="@applicationlink">
-                  <a>
-                    <xsl:attribute name="href"><xsl:value-of select="." /></xsl:attribute>
-                    Edit 
-                  </a>
-                  <br />
-                </xsl:for-each>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/packages/bookmarks/xsl/bookmarks.xsl b/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/packages/bookmarks/xsl/bookmarks.xsl
deleted file mode 100755
index 9c85be7da..000000000
--- a/ccm-bookmarks/debian/ccm-bookmarks/usr/share/java/webapps/ccm-bookmarks-6.3.0/ROOT/packages/bookmarks/xsl/bookmarks.xsl
+++ /dev/null
@@ -1,460 +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:bmrk="http://www.redhat.com/bmrk/1.0"
-    xmlns:admin="http://www.arsdigita.com/admin-ui/1.0"
-    xmlns:cms="http://www.arsdigita.com/cms/1.0">
-
-<!-- The order of imports below is important. Please don't change
-     them without appropriate testing. -->
-
-<xsl:import href="../../acs-admin/xsl/admin_en.xsl"/>
-<xsl:import href="../../categorization/xsl/categorization.xsl"/>
-<xsl:import href="../../bebop/xsl/DimensionalNavbar.xsl"/>
-<xsl:import href="../../toolbox/xsl/ControlBar.xsl"/>
-
-<xsl:output method="html" indent="yes"/>
-
-<xsl:param name="contextPath"/>
-
-<xsl:template match="bebop:page[@class='bmrk']">
-  <html>
-    <head>
-      <title><xsl:value-of select="bebop:title"/></title>
-<!--
-      <link href="/packages/portalserver/www/css/portalserver.css" rel="stylesheet" type="text/css"/>
-
-       <style type="text/css">
-         BODY { background: white; color: black}
-         .main   {background-color: #ffffff;}
-         table.globalHeader { background-color: rgb(225,225,225);}
-         table.bottomRule { background: rgb(162,30,30);}
-         table.topRuleNoTabs { background: rgb(162,30,30);}
-         </style>
--->
-
-      <link rel="stylesheet" type="text/css" href="/css/acs-master.css" />
-      <link rel="stylesheet" type="text/css" href="/__ccm__/static/cms/admin/cms-admin.css" />
-
-      <xsl:for-each select="bebop:stylesheet">
-        <link href="{@href}" rel="stylesheet" type="{@type}"/>
-      </xsl:for-each>
-
-<xsl:value-of select="bmrk:styleblock" disable-output-escaping="yes"/>
-
-    </head>
-    <body>
-      <xsl:apply-templates select="bmrk:header"/>
-
-      <xsl:apply-templates select="bmrk:body"/>
-
-      <xsl:apply-templates select="bmrk:footer"/>
-
-      <xsl:apply-templates select="bmrk:styleblock"/>
-
-      <!--
-      This is here so the the bebop page structure is displayed under /debug/
-      -->
-      <xsl:apply-templates select="*[position()>4]"/>
-    </body>
-  </html>
-</xsl:template>
-
-<xsl:template match="bebop:link[@class='portalControlProfileLink']">
-       <xsl:call-template name="bebop:link" />
- <br />
-</xsl:template>
-
-<xsl:template match="bmrk:header">
-
-  <table id="global-header">
-    <tr>
-      <td id="context">
-        <xsl:if test="bebop:dimensionalNavbar[@class = 'portalNavbar']">
-          <xsl:apply-templates select="bebop:dimensionalNavbar[@class = 'portalNavbar']"/>
-        </xsl:if>
-      </td>
-      <td>
-        <table id="global-links">
-          <tr>
-            <td class="global-link-icon">
-             <a href="{../bmrk:global/bebop:link[@class = 'signoutLink']/@href}">
-              <img src="/assets/lock.png" height="18" width="14"/>
-             </a>
-            </td>
-            <td class="global-link">
-             <a href="{../bmrk:global/bebop:link[@class = 'signoutLink']/@href}">
-               Sign out
-              </a>
-             </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-
-  <div id="page-title">
-    <xsl:value-of select="../bebop:title"/>
-    <table class="localHeader">
-      <tr>
-        <td class="localControl">
-          <xsl:apply-templates select="bebop:link[@class = 'portalControlProfileLink']"/>
-          <xsl:apply-templates select="bebop:link[@class = 'portalControl']"/>
-        </td>
-      </tr>
-    </table>
-  </div>
-
-</xsl:template>
-
-<xsl:template match="bmrk:body">
-  <div>
-    <div class="tabbed-pane">
-
-    <xsl:variable name="portalTabs" select="bebop:list[@class = 'portalTabs']"/>
-
-    <xsl:choose>
-      <xsl:when test="count($portalTabs/bebop:cell) > 1">
-        <!--
-        If there is only one tab in this portal, don't bother to
-        display it.
-        -->
-
-        <table class="tab-set">
-
-          <tr valign="bottom">
-            <td class="trimSpace"><xsl:text>&#160;</xsl:text></td>
-            <xsl:for-each select="$portalTabs/bebop:cell">
-              <xsl:choose>
-                <xsl:when test="@selected">
-                  <!-- start currently active tab -->
-                  <td class="tabBeginning"><xsl:text>&#160;&#160;</xsl:text></td>
-                  <td class="current-tab-label" nowrap="nowrap"><xsl:value-of select="bebop:portal/@title"/></td>
-                  <td class="current-tab-end"><xsl:text>&#160;&#160;</xsl:text></td>
-                  <td class="trimSpace"><xsl:text>&#160;</xsl:text></td>
-                  <!-- end currently active tab -->
-                </xsl:when>
-                <xsl:otherwise>
-                  <!-- start inactive tab -->
-                  <td>
-                    <table cellpadding="0" cellspacing="0" border="0">
-                      <tr height="3"><td><img src="/assets/general/spacer.gif" height="3"/></td></tr>
-                      <tr height="23">
-                         <td class="tabBeginningOff"><xsl:text>&#160;&#160;</xsl:text></td>
-                         <td class="tab-label" nowrap="nowrap"><xsl:apply-templates select="bebop:link"/></td>
-                      <td class="tabEndOff"><xsl:text>&#160;&#160;</xsl:text></td>
-                      </tr>
-                    </table>
-                    <td class="trimSpace"><xsl:text>&#160;</xsl:text></td>
-                  </td>
-                  <!-- end inactive tab -->
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:for-each>
-            <td class="trimSpace" width="100%"><xsl:text>&#160;</xsl:text></td>
-          </tr>
-        </table>
-
-        <table class="topRuleUnderTabs">
-          <tr><td></td></tr>
-        </table>
-
-      </xsl:when>
-      <xsl:when test="not(bebop:tabbedPane)">
-        <table class="topRuleNoTabs">
-          <tr><td></td></tr>
-        </table>
-      </xsl:when>
-    </xsl:choose>
-
-    </div>
-
-    <xsl:apply-templates/>
-
-  </div>
-
-  <table class="bottomRule">
-    <tr><td></td></tr>
-  </table>
-
-</xsl:template>
-
-  <xsl:template match="bmrk:question-answer-pair" xmlns:bmrk="http://www.arsdigita.com/bmrk/1.0">
-    <p>
-      <a name="{../@key}"/>
-      <h2>
-        Q.
-        <xsl:apply-templates select="bebop:label[@class='question']"/>
-      </h2>
-      <blockquote>
-        <b>A.</b>
-        <xsl:apply-templates select="bebop:label[@class='answer']"/>
-      </blockquote>
-    </p>
-  </xsl:template>
-
-
-<xsl:template match="cms:dimensionalNavbar[@class = 'portalNavbar']">
-  <xsl:for-each select="*">
-    <xsl:choose>
-      <xsl:when test="position() != last()">
-        <xsl:apply-templates select="."/>
-        <span class="contextBarSeparator"><xsl:text disable-output-escaping="yes">&amp;nbsp;&amp;gt;&amp;nbsp;</xsl:text></span>
-      </xsl:when>
-      <xsl:otherwise>
-        <span class="immediateContext"><xsl:apply-templates select="."/></span>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="bebop:list[@class = 'portalTabs']">
-  <xsl:apply-templates select="bebop:cell/bebop:portal"/>
-</xsl:template>
-
-<xsl:template match="bebop:splitPanel">
-  <table class="current-pane">
-    <xsl:if test="not(bebop:cell/bebop:label[text() = '&amp;nbsp;'])">
-      <tr>
-        <td colspan="3" class="splitPanelHeader">
-          <table width="100%" cellspacing="4" cellpadding="0" border="0">
-            <tr><td><xsl:apply-templates select="bebop:cell[1]"/></td></tr>
-          </table>
-        </td>
-      </tr>
-      <tr><td colspan="3" class="inactiveTabColor" height="2"><img src="/assets/general/spacer.gif" height="2"/></td></tr>
-    </xsl:if>
-    <tr>
-      <td class="splitPanelLeft">
-        <table width="100%" cellspacing="4" cellpadding="0" border="0">
-          <tr><td><xsl:apply-templates select="bebop:cell[2]"/></td></tr>
-        </table>
-      </td>
-      <td class="inactiveTabColor" width="2"><img src="/assets/general/spacer.gif" width="2"/></td>
-      <td class="splitPanelRight">
-        <table width="100%" cellspacing="4" cellpadding="0" border="0">
-          <tr><td><xsl:apply-templates select="bebop:cell[3]"/></td></tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</xsl:template>
-
-<xsl:template match="bebop:tabbedPane">
-  <xsl:variable name="tabs" select="bebop:tabStrip/bebop:tab"/>
-
-  <table cellpadding="0" cellspacing="0" border="0" class="tabs">
-    <tr>
-      <td class="trimSpace"><xsl:text>&#160;</xsl:text></td>
-      <xsl:for-each select="$tabs">
-        <xsl:choose>
-          <xsl:when test="@current = 't'">
-            <!-- start currently active tab -->
-            <td class="tabBeginning"><xsl:text>&#160;&#160;</xsl:text></td>
-            <td class="activeTab" nowrap="nowrap"><xsl:value-of select="bebop:label"/></td>
-            <td class="tabEnd"><xsl:text>&#160;&#160;</xsl:text></td>
-            <td class="trimSpace"><xsl:text>&#160;</xsl:text></td>
-            <!-- end currently active tab -->
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- start inactive tab -->
-            <td>
-              <table cellpadding="0" cellspacing="0" border="0">
-                <tr height="3"><td></td></tr>
-                <tr height="23">
-                  <td class="tabBeginningOff"><xsl:text>&#160;&#160;</xsl:text></td>
-                  <td class="inactiveTab" nowrap="nowrap"><a href="{@href}"><xsl:apply-templates select="bebop:label"/></a>
-                  </td>
-                  <td class="tabEndOff"><xsl:text>&#160;&#160;</xsl:text></td>
-                </tr>
-                </table>
-               <td class="trimSpace"><xsl:text>&#160;</xsl:text></td>
-            </td>
-            <!-- end inactive tab -->
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-      <td class="trimSpace" width="100%"><xsl:text>&#160;</xsl:text></td>
-    </tr>
-  </table>
-
-  <table class="topRuleUnderTabs">
-    <tr><td></td></tr>
-  </table>
-
-  <xsl:apply-templates select="bebop:currentPane/*"/>
-</xsl:template>
-
-<xsl:template match="bebop:tabbedPane[@class='portalserver_admin']">
-<div class="tabs">
-      <xsl:for-each select="bebop:tabStrip/bebop:tab">
-        <xsl:choose>
-          <xsl:when test="@current">
-            <table class="selected">
-              <tr>
-                <td class="label"><xsl:apply-templates/></td>
-                <td class="end"/>
-              </tr>
-            </table>
-          </xsl:when>
-          <xsl:otherwise>
-            <a href="{@href}">
-              <table class="unselected">
-                <tr>
-                  <td class="label"><xsl:apply-templates/></td>
-                  <td class="end"/>
-                </tr>
-              </table>
-            </a>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-      <div class="rule"/>
-      <xsl:apply-templates select="bebop:currentPane"/>
-    </div>
-</xsl:template>
-
-<xsl:template match="bebop:itemDetail">
-  <table width="100%" cellpadding="2" cellspacing="0" border="0">
-    <xsl:for-each select="bebop:property">
-      <tr>
-        <td width="25%" align="right" valign="top"><b><small><xsl:value-of select="bebop:name"/>:</small></b></td>
-        <td width="75%"><xsl:apply-templates select="*[name()!='bebop:name']"/></td>
-      </tr>
-    </xsl:for-each>
-    <xsl:for-each select="bebop:action">
-      <tr>
-        <td width="25%" align="right" valign="top">
-          <xsl:if test="position() = 1"><b><small>Actions:</small></b></xsl:if>
-        </td>
-        <td width="75%"><xsl:apply-templates select="bebop:link"/></td>
-      </tr>
-    </xsl:for-each>
-  </table>
-</xsl:template>
-
-<xsl:template match="bebop:label[@class='nullArrow']">
-    <img src ="/assets/general/spacer.gif" border="0" width="16" height ="16">
-    </img>
-</xsl:template>
-
-<xsl:template match="bebop:table"
-              xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
- <table class="fancy">
-   <xsl:for-each select="@*">
-     <xsl:attribute name="{name()}">
-       <xsl:value-of select="."/>
-     </xsl:attribute>
-   </xsl:for-each>
-   <xsl:apply-templates select="bebop:thead"/>
-   <xsl:apply-templates select="bebop:tbody"/>
- </table>
-</xsl:template>
-
-<xsl:template match="bebop:table[@class='plain']"
-              xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <table>
-     <xsl:for-each select="@*">
-       <xsl:attribute name="{name()}">
-         <xsl:value-of select="."/>
-       </xsl:attribute>
-     </xsl:for-each>
-     <xsl:apply-templates select="bebop:thead"/>
-     <xsl:apply-templates select="bebop:tbody"/>
-   </table>
-</xsl:template>
-
-<xsl:template match="admin:groupInfo[@class='ecm']">
-<ul>
-  <li> Group Name: <xsl:value-of select="@name"/> </li>
-  <li> Primary Email: <xsl:value-of select="@email"/> </li>
-</ul>
-</xsl:template>
-
-<xsl:template match="bmrk:styleblock">
-</xsl:template>
-
-<xsl:template name="bebop:actionLink" match="bebop:link[@class='actionLink']">
-       <!-- Begin Image -->
-
-       <!-- Image JavaScript  -->
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-
-       <!-- This is ugly, but I need the whole output on one line =p -->
-       <![CDATA[ document.write(']]><a href="{@href}" onclick="{@onclick}"><img src="/assets/action-generic.png" border="0" width="11" height="11"><xsl:attribute name="alt"><xsl:apply-templates mode="javascript-mode"/></xsl:attribute></img><![CDATA[')]]>
-       <![CDATA[ document.write(']]></a><![CDATA[')]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <!-- Image No JavaScript  -->
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[document.write("\<!--") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <a href="{@href_no_javascript}">
-         <img src="/assets/action-generic.png" border="0" width="11" height="11">
-           <xsl:attribute name="alt">
-             <xsl:apply-templates/>
-           </xsl:attribute>
-         </img>
-       </a>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[document.write("\<!--") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <!-- Begin Link -->
-
-       <xsl:text>&#160;</xsl:text>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-
-       <!-- This is ugly, but I need the whole output on one line =p -->
-       <![CDATA[ document.write(']]><a><xsl:for-each select="@*[name() != 'href_no_javascript']"><xsl:attribute name="{name()}"><xsl:value-of select="."/></xsl:attribute></xsl:for-each><xsl:apply-templates mode="javascript-mode"/><![CDATA[')]]>
-       <![CDATA[ document.write(']]></a><![CDATA[')]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[document.write("\<!--") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-       <a>
-        <xsl:for-each select="@*[name() != 'href']">
-            <xsl:choose>
-             <xsl:when test="name() = 'href_no_javascript'">
-              <xsl:attribute name="href">
-               <xsl:value-of select="."/>
-              </xsl:attribute>
-             </xsl:when>
-             <xsl:when test="name() = 'onclick'">
-             </xsl:when>
-             <xsl:otherwise>
-              <xsl:attribute name="{name()}">
-               <xsl:value-of select="."/>
-              </xsl:attribute>
-             </xsl:otherwise>
-            </xsl:choose>
-        </xsl:for-each>
-        <xsl:apply-templates />
-       </a>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[ document.write("--\>") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-bookmarks/web/packages/bookmarks/xsl/bookmarks.xsl b/ccm-bookmarks/web/packages/bookmarks/xsl/bookmarks.xsl
index 9c85be7da..aca2364b8 100755
--- a/ccm-bookmarks/web/packages/bookmarks/xsl/bookmarks.xsl
+++ b/ccm-bookmarks/web/packages/bookmarks/xsl/bookmarks.xsl
@@ -385,7 +385,7 @@
        <![CDATA[ <!-- begin script ]]>
 
        <!-- This is ugly, but I need the whole output on one line =p -->
-       <![CDATA[ document.write(']]><a href="{@href}" onclick="{@onclick}"><img src="/assets/action-generic.png" border="0" width="11" height="11"><xsl:attribute name="alt"><xsl:apply-templates mode="javascript-mode"/></xsl:attribute></img><![CDATA[')]]>
+       <![CDATA[ document.write(']]><a href="{@href}" onclick="{@onclick}"><img src="/__ccm__/static/cms/admin/action-group/action-generic.png" border="0" width="11" height="11"><xsl:attribute name="alt"><xsl:apply-templates mode="javascript-mode"/></xsl:attribute></img><![CDATA[')]]>
        <![CDATA[ document.write(']]></a><![CDATA[')]]>
        <![CDATA[ // end script --> ]]>
        </script>
@@ -398,7 +398,7 @@
        </script>
 
        <a href="{@href_no_javascript}">
-         <img src="/assets/action-generic.png" border="0" width="11" height="11">
+         <img src="/__ccm__/static/cms/admin/action-group/action-generic.png" border="0" width="11" height="11">
            <xsl:attribute name="alt">
              <xsl:apply-templates/>
            </xsl:attribute>
diff --git a/ccm-cms/web/__ccm__/static/cms/admin/category-step/category-step.xsl b/ccm-cms/web/__ccm__/static/cms/admin/category-step/category-step.xsl
index 583e15e51..5fb10fe40 100755
--- a/ccm-cms/web/__ccm__/static/cms/admin/category-step/category-step.xsl
+++ b/ccm-cms/web/__ccm__/static/cms/admin/category-step/category-step.xsl
@@ -1,169 +1,169 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:cms="http://www.arsdigita.com/cms/1.0"
-  version="1.0">
-
-  <xsl:output method="html" indent="yes"/>
-
-  <xsl:template match="cms:categoryStep">
-    <h2>Assign categories</h2>
-    <xsl:apply-templates select="*"/>
-  </xsl:template>
-
-  <xsl:template match="cms:categoryStepSummary">
-    <xsl:for-each select="cms:categoryRoots/cms:categoryRoot">
-      <xsl:sort  select="@name"/>
-      <xsl:variable name="name">
-        <xsl:value-of select="@name"/>
-      </xsl:variable>
-      <h3><xsl:value-of select="$name"/></h3>
-      
-      <xsl:if test="@addAction">
-        <script LANGUAGE="JavaScript">
-          <![CDATA[ <!-- begin script ]]>
-          <![CDATA[ document.write('<a href="]]><xsl:value-of select="@addJSAction"/><![CDATA["><img src="/assets/action-add.png" border="0"/></a>')]]>
-          <![CDATA[ document.write("\<!--") ]]>
-          <![CDATA[ // end script --> ]]>
-        </script>
-        <a href="{@addAction}">
-          <img src="/assets/action-add.png" border="0"/>
-        </a>
-        <script LANGUAGE="JavaScript">
-          <![CDATA[ <!-- begin script ]]>
-          <![CDATA[ document.write("--\>") ]]>
-          <![CDATA[ // end script --> ]]>
-        </script>
-        
-        <script LANGUAGE="JavaScript">
-          <![CDATA[ <!-- begin script ]]>
-          <![CDATA[ document.write('<a href="]]><xsl:value-of select="@addJSAction"/><![CDATA[">Add categories</a>')]]>
-          <![CDATA[ document.write("\<!--") ]]>
-          <![CDATA[ // end script --> ]]>
-        </script>
-        <xsl:text>&#160;</xsl:text>
-        <a href="{@addAction}">
-          <xsl:text>Add categories</xsl:text>
-        </a>
-        <script LANGUAGE="JavaScript">
-          <![CDATA[ <!-- begin script ]]>
-          <![CDATA[ document.write("--\>") ]]>
-          <![CDATA[ // end script --> ]]>
-        </script>
-      </xsl:if>
-       
-      <xsl:choose>
-        <xsl:when test="count(../../cms:itemCategories/cms: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="../../cms:itemCategories/cms:itemCategory[starts-with(@path, $name)]">
-              <xsl:sort select="@path"/>
-              <li>
-                <xsl:value-of select="substring(@path, string-length($name) + 5)"/>&#160;
-                <xsl:if test="@deleteAction">
-                  <a href="{@deleteAction}"><img src="/assets/action-delete.png" border="0"/></a>
-                  <xsl:text>&#160;</xsl:text>
-                  <a href="{@deleteAction}">Remove</a>
-                </xsl:if>
-              </li>
-            </xsl:for-each>
-          </ul>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:template match="cms:categoryWidget">
-    <xsl:choose>
-      <xsl:when test="@mode = 'javascript'">
-        <xsl:apply-templates select="." mode="cms:javascript"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="." mode="cms:plain"/>        
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="cms:categoryWidget" mode="cms:javascript">
-    <script type="text/javascript" src="/assets/prototype.js"/>
-    <script type="text/javascript" src="/assets/category-step.js"/>
-    <div>
-      <xsl:apply-templates select="cms:category" mode="cms:javascriptCat">
-        <xsl:with-param name="expand" select="'block'"/>
-      </xsl:apply-templates>
-    </div>
-    <h3>Selected categories</h3>
-    <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>
-  </xsl:template>
-
-  <xsl:template match="cms:category" mode="cms:javascriptCat">
-    <xsl:param name="expand" select="'none'"/>
-    <xsl:variable name="linkStyle">
-      <xsl:choose>
-        <xsl:when test="@isAbstract != '1' and @isSelected != '1'">inline</xsl:when>
-        <xsl:otherwise>none</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="nameStyle">
-      <xsl:choose>
-        <xsl:when test="@isAbstract != '1' and @isSelected != '1'">none</xsl:when>
-        <xsl:otherwise>inline</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="toggle">
-    	
-      <xsl:choose>
-        <xsl:when test="@root = '1' or ancestor::cms:category/@expand='all'">catBranchToggle</xsl:when>
-        <xsl:otherwise>catToggle</xsl:otherwise>
-      </xsl:choose> 
-    </xsl:variable>
-
-    <div id="catSelf{@id}">
-      <xsl:choose>
-        <xsl:when test="$expand='none' and (@root='1' or count(cms:category) > 0)">
-          <a href="#" onClick="{$toggle}('{@node-id}');"><img id="catTog{@node-id}" src="/assets/action-add.png" width="14" height="14" border="0"/></a>
-        </xsl:when>
-        <xsl:when test="$expand!='none' and (@root='1' or count(cms:category) > 0)">
-          <a href="#" onClick="{$toggle}('{@node-id}');"><img id="catTog{@node-id}" src="/assets/action-delete.png" width="14" height="14" border="0"/></a>
-        </xsl:when>
-        <xsl:otherwise>
-          <img src="/assets/action-generic.png" width="14" height="14" border="0"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <a id="catLn{@id}" 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:attribute>
-
-        <xsl:if test="@description">
-          <xsl:attribute name="title">
-            <xsl:value-of select="@description"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:call-template name="cat-widget-cat-name"/>
-      </a>
-      <span id="catNm{@id}" style="padding-left: 6px; display: {$nameStyle}">
-        <xsl:if test="@description">
-          <xsl:attribute name="title">
-            <xsl:value-of select="@description"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:call-template name="cat-widget-cat-name"/>
-      </span>
-    </div>
-    <div id="catCh{@node-id}" style="margin-left: 20px; display: {$expand}">
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:cms="http://www.arsdigita.com/cms/1.0"
+  version="1.0">
+
+  <xsl:output method="html" indent="yes"/>
+
+  <xsl:template match="cms:categoryStep">
+    <h2>Assign categories</h2>
+    <xsl:apply-templates select="*"/>
+  </xsl:template>
+
+  <xsl:template match="cms:categoryStepSummary">
+    <xsl:for-each select="cms:categoryRoots/cms:categoryRoot">
+      <xsl:sort  select="@name"/>
+      <xsl:variable name="name">
+        <xsl:value-of select="@name"/>
+      </xsl:variable>
+      <h3><xsl:value-of select="$name"/></h3>
+      
+      <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(../../cms:itemCategories/cms: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="../../cms:itemCategories/cms: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>
+  </xsl:template>
+
+  <xsl:template match="cms:categoryWidget">
+    <xsl:choose>
+      <xsl:when test="@mode = 'javascript'">
+        <xsl:apply-templates select="." mode="cms:javascript"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="." mode="cms:plain"/>        
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="cms:categoryWidget" mode="cms:javascript">
+    <script type="text/javascript" src="/assets/prototype.js"/>
+    <script type="text/javascript" src="/assets/category-step/category-step.js"/>
+    <div>
+      <xsl:apply-templates select="cms:category" mode="cms:javascriptCat">
+        <xsl:with-param name="expand" select="'block'"/>
+      </xsl:apply-templates>
+    </div>
+    <h3>Selected categories</h3>
+    <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>
+  </xsl:template>
+
+  <xsl:template match="cms:category" mode="cms:javascriptCat">
+    <xsl:param name="expand" select="'none'"/>
+    <xsl:variable name="linkStyle">
+      <xsl:choose>
+        <xsl:when test="@isAbstract != '1' and @isSelected != '1'">inline</xsl:when>
+        <xsl:otherwise>none</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="nameStyle">
+      <xsl:choose>
+        <xsl:when test="@isAbstract != '1' and @isSelected != '1'">none</xsl:when>
+        <xsl:otherwise>inline</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="toggle">
+  	
+      <xsl:choose>
+        <xsl:when test="@root = '1' or ancestor::cms:category/@expand='all'">catBranchToggle</xsl:when>
+        <xsl:otherwise>catToggle</xsl:otherwise>
+      </xsl:choose> 
+    </xsl:variable>
+
+    <div id="catSelf{@id}">
+      <xsl:choose>
+        <xsl:when test="$expand='none' and (@root='1' or count(cms:category) > 0)">
+          <a href="#" onClick="{$toggle}('{@node-id}');"><img id="catTog{@node-id}" src="/assets/categeory-step/action-add.png" width="14" height="14" border="0"/></a>
+        </xsl:when>
+        <xsl:when test="$expand!='none' and (@root='1' or count(cms:category) > 0)">
+          <a href="#" onClick="{$toggle}('{@node-id}');"><img id="catTog{@node-id}" 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{@id}" 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:attribute>
+
+        <xsl:if test="@description">
+          <xsl:attribute name="title">
+            <xsl:value-of select="@description"/>
+          </xsl:attribute>
+        </xsl:if>
+        <xsl:call-template name="cat-widget-cat-name"/>
+      </a>
+      <span id="catNm{@id}" style="padding-left: 6px; display: {$nameStyle}">
+        <xsl:if test="@description">
+          <xsl:attribute name="title">
+            <xsl:value-of select="@description"/>
+          </xsl:attribute>
+        </xsl:if>
+        <xsl:call-template name="cat-widget-cat-name"/>
+      </span>
+    </div>
+    <div id="catCh{@node-id}" style="margin-left: 20px; display: {$expand}">
         <xsl:choose>
           <xsl:when test="@order='sortKey'">
-      <xsl:apply-templates select="cms:category" mode="cms:javascriptCat">
-        <xsl:sort data-type="number" select="@sortKey"/>
-      </xsl:apply-templates>
+      <xsl:apply-templates select="cms:category" mode="cms:javascriptCat">
+        <xsl:sort data-type="number" select="@sortKey"/>
+      </xsl:apply-templates>
           </xsl:when>
           <xsl:otherwise>
             <xsl:apply-templates select="cms:category" mode="cms:javascriptCat">
@@ -172,58 +172,58 @@
           </xsl:otherwise>
         </xsl:choose>
       
-    </div>
-  </xsl:template>
-
-  <xsl:template name="cat-widget-cat-name">
-    <xsl:value-of select="@name"/>
-  </xsl:template>
-
-  <xsl:template match="cms:categoryWidget" mode="cms:plain">
-    <select name="{@name}" size="30" multiple="multiple">
-      <xsl:apply-templates select="cms:category[position() = 1]/cms:category[@isAbstract = '0']" mode="cms:plainCat"/>
-    </select>
-  </xsl:template>
-
-  <xsl:template match="cms:category" mode="cms:plainCat">
-    <xsl:if test="@isSelected != '1' and @isAbstract != '1'">
-      <option value="{@id}"><xsl:value-of select="@fullname"/></option>
-    </xsl:if>
-    
-    <xsl:apply-templates select="cms:category[@isAbstract = '0']" mode="cms: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:stylesheet>
+    </div>
+  </xsl:template>
+
+  <xsl:template name="cat-widget-cat-name">
+    <xsl:value-of select="@name"/>
+  </xsl:template>
+
+  <xsl:template match="cms:categoryWidget" mode="cms:plain">
+    <select name="{@name}" size="30" multiple="multiple">
+      <xsl:apply-templates select="cms:category[position() = 1]/cms:category[@isAbstract = '0']" mode="cms:plainCat"/>
+    </select>
+  </xsl:template>
+
+  <xsl:template match="cms:category" mode="cms:plainCat">
+    <xsl:if test="@isSelected != '1' and @isAbstract != '1'">
+      <option value="{@id}"><xsl:value-of select="@fullname"/></option>
+    </xsl:if>
+  
+    <xsl:apply-templates select="cms:category[@isAbstract = '0']" mode="cms: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:stylesheet>
diff --git a/ccm-cms/web/assets/category-step/action-add.png b/ccm-cms/web/assets/category-step/action-add.png
new file mode 100755
index 000000000..aa7ad618e
Binary files /dev/null and b/ccm-cms/web/assets/category-step/action-add.png differ
diff --git a/ccm-cms/web/assets/category-step/action-delete.png b/ccm-cms/web/assets/category-step/action-delete.png
new file mode 100755
index 000000000..ff4a44d5d
Binary files /dev/null and b/ccm-cms/web/assets/category-step/action-delete.png differ
diff --git a/ccm-cms/web/assets/category-step/action-generic.png b/ccm-cms/web/assets/category-step/action-generic.png
new file mode 100755
index 000000000..0e2cc855b
Binary files /dev/null and b/ccm-cms/web/assets/category-step/action-generic.png differ
diff --git a/ccm-cms/web/assets/category-step.js b/ccm-cms/web/assets/category-step/category-step.js
similarity index 89%
rename from ccm-cms/web/assets/category-step.js
rename to ccm-cms/web/assets/category-step/category-step.js
index 7be912e6f..597dc2149 100755
--- a/ccm-cms/web/assets/category-step.js
+++ b/ccm-cms/web/assets/category-step/category-step.js
@@ -8,13 +8,13 @@
            // reload the branch
            new Ajax.Updater('catCh'+id, 'load-cat.jsp',
                 {parameters:'nodeID='+id});
-           elImg.src = "/assets/action-delete.png";
+           elImg.src = "./action-delete.png";
            // TODO check catWd, update selected catLn/catNm
            // in case selected cats are in reloaded branch
         } else {
            elChildren.style.display = "none";
            elChildren.innerHTML = ''; // discard the branch
-           elImg.src = "/assets/action-add.png";
+           elImg.src = "./action-add.png";
         }
         return false;
       }
@@ -24,10 +24,10 @@
 
         if (elChildren.style.display != "block") {
           elChildren.style.display = "block";
-          elImg.src = "/assets/action-delete.png";
+          elImg.src = "./action-delete.png";
         } else {
           elChildren.style.display = "none";
-          elImg.src = "/assets/action-add.png";
+          elImg.src = "./action-add.png";
         }
         return false;
       }
diff --git a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ccm-docmgr-6.3.0-pdl.jar b/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ccm-docmgr-6.3.0-pdl.jar
deleted file mode 100755
index 42d3ae6ca..000000000
Binary files a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ccm-docmgr-6.3.0-pdl.jar and /dev/null differ
diff --git a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ccm-docmgr-6.3.0-sql.jar b/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ccm-docmgr-6.3.0-sql.jar
deleted file mode 100755
index 828fa67b7..000000000
Binary files a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ccm-docmgr-6.3.0-sql.jar and /dev/null differ
diff --git a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ccm-docmgr-6.3.0.jar b/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ccm-docmgr-6.3.0.jar
deleted file mode 100755
index de79073d9..000000000
Binary files a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/ccm-docmgr-6.3.0.jar and /dev/null differ
diff --git a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/__ccm__/apps/cmsdocs/xsl/index.xsl b/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/__ccm__/apps/cmsdocs/xsl/index.xsl
deleted file mode 100755
index 733067ae5..000000000
--- a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/__ccm__/apps/cmsdocs/xsl/index.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  version="1.0">
-
-  <xsl:import href="../../../../packages/docmgr/xsl/docs.xsl"/>
-
-</xsl:stylesheet>
diff --git a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/assets/cw/applications/document-16.gif b/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/assets/cw/applications/document-16.gif
deleted file mode 100755
index 1c9cb6125..000000000
Binary files a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/assets/cw/applications/document-16.gif and /dev/null differ
diff --git a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/assets/cw/applications/document-32.gif b/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/assets/cw/applications/document-32.gif
deleted file mode 100755
index 5c2892797..000000000
Binary files a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/assets/cw/applications/document-32.gif and /dev/null differ
diff --git a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/packages/docmgr/xsl/docmgr-portlet.xsl b/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/packages/docmgr/xsl/docmgr-portlet.xsl
deleted file mode 100755
index 60cd11de5..000000000
--- a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/packages/docmgr/xsl/docmgr-portlet.xsl
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:forum="http://www.arsdigita.com/forum/1.0"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
-  xmlns:portalserver="http://www.redhat.com/portalserver/1.0"
-  version="1.0">
-
-  <xsl:output method="html"/>
-
-  <xsl:template match="bebop:portlet[@bebop:classname='com.arsdigita.cms.docmgr.ui.LegacyCategoryDocsNavigatorPortlet' and //bebop:page/@id='viewWorkspace']">
-    <H3><xsl:value-of select="@title" /></H3>
-    <xsl:apply-templates />
-  </xsl:template>
-  
-  <xsl:template match="bebop:portlet[@bebop:classname='com.arsdigita.cms.docmgr.ui.RecentUpdatedDocsPortletRenderer' and //bebop:page/@id='viewWorkspace']">
-    <xsl:choose>
-      <xsl:when test="(../@style='W')  or
-                      ((../@style='WN') and (@cellNumber='1')) or
-                      ((../@style='NW') and (@cellNumber='2')) or
-                      ((../@style='WN') and (@cellNumber='3')) or
-                      ((../@style='NWN') and (@cellNumber='2')) or
-                      ((../@style='NNN') and (@cellNumber='1'))">
-        <H3><xsl:value-of select="@title" /></H3>
-
-        <table width="100%" border="0" cellpadding="0" cellspacing="0">
-
-          <tr>
-            <td class="bglight"><b>5 Most Recent Items</b></td>
-            <td width="100" align="right" class="bglight"><b>Size</b></td>
-            <td width="100" align="right" class="bglight"><b>Modified</b></td>
-          </tr>
-
-          <xsl:for-each select="descendant-or-self::bebop:tbody/bebop:trow">
-            <xsl:if test="position()&lt;='5'">
-              <tr>
-                <td class="bglight">
-                  <a href="{./bebop:cell[6]/bebop:link/@href}" title="Download this document"><xsl:value-of select="./bebop:cell[1]/bebop:link/bebop:label" /></a>
-                </td>
-                <td width="100" align="right" class="bglight">
-                  <xsl:apply-templates select="./bebop:cell[3]"/>
-                </td>
-                <td width="100" align="right" class="bglight">
-                  <xsl:call-template name="docmgrDate">
-                    <xsl:with-param name="date" select="./bebop:cell[5]/bebop:label" />
-                  </xsl:call-template>
-                </td>
-              </tr>
-            </xsl:if>
-          </xsl:for-each>
-          
-          <xsl:if test="contains(descendant-or-self::bebop:link[@class='actionLink']/bebop:label, 'New Document')">
-            <tr>
-              <td colspan="3">
-                <a href="{./bebop:gridPanel/bebop:panelRow[1]/bebop:cell/bebop:link[@class='actionLink']/@href}">add a document</a>
-              </td>
-            </tr>
-          </xsl:if>
-
-          <tr>
-            <td colspan="3">
-              <a href="{@applicationlink}">view all documents</a>
-            </td>
-          </tr>
-
-        </table>
-
-      </xsl:when>
-      <xsl:otherwise>
-
-        <H3><xsl:value-of select="@title" /></H3>
-        <p>5 Most Recent Items</p>
-        <ul>
-
-          <xsl:for-each select="descendant-or-self::bebop:tbody/bebop:trow">
-            <xsl:if test="position()&lt;='5'">
-              <li>
-                <a href="{./bebop:cell[6]/bebop:link/@href}" title="Download this document"><xsl:value-of select="./bebop:cell[1]/bebop:link/bebop:label" /></a>
-              </li>
-            </xsl:if>
-          </xsl:for-each>
-
-        </ul>
-
-        <xsl:if test="contains(descendant-or-self::bebop:link[@class='actionLink']/bebop:label, 'New Document')">
-          <div>
-            <a href="{./bebop:gridPanel/bebop:panelRow[1]/bebop:cell/bebop:link[@class='actionLink']/@href}">add a document</a>
-          </div>
-        </xsl:if>
-
-        <div>
-          <a href="{@applicationlink}">view all documents</a>
-        </div>
-
-      </xsl:otherwise>
-    </xsl:choose>
-
-  </xsl:template>
-
-  <xsl:template name="docmgrDate">
-    <xsl:param name="date" />
-    
-    <xsl:if test="string($date)!='null'">
-      <xsl:if test="string-length($date)!='0'">
-
-        <!-- Day -->
-        <xsl:variable name="day-month" select="substring-before($date, '/0')"/>
-        <xsl:variable name="day" select="substring-after($day-month, '/')"/>
-        <xsl:variable name="month" select="substring-before($day-month, '/')"/>
-        <xsl:variable name="year" select="substring-after($date, '/0')"/>
-
-        <xsl:if test="string-length($day)='1'">
-          <xsl:text>0</xsl:text>
-        </xsl:if>
-        <xsl:value-of select="$day" />
-        <xsl:text>-</xsl:text>
-
-        <!-- Month -->
-        <xsl:choose>
-          <xsl:when test="$month='1'">01</xsl:when>
-          <xsl:when test="$month='2'">02</xsl:when>
-          <xsl:when test="$month='3'">03</xsl:when>
-          <xsl:when test="$month='4'">04</xsl:when>
-          <xsl:when test="$month='5'">05</xsl:when>
-          <xsl:when test="$month='6'">06</xsl:when>
-          <xsl:when test="$month='7'">07</xsl:when>
-          <xsl:when test="$month='8'">08</xsl:when>
-          <xsl:when test="$month='9'">09</xsl:when>
-          <xsl:when test="$month='10'">10</xsl:when>
-          <xsl:when test="$month='11'">11</xsl:when>
-          <xsl:when test="$month='12'">12</xsl:when>
-          <xsl:otherwise></xsl:otherwise>
-          </xsl:choose><xsl:text>-</xsl:text>200<xsl:value-of select="substring($year, 1, 2 )" />
-      </xsl:if>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/packages/docmgr/xsl/docs.xsl b/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/packages/docmgr/xsl/docs.xsl
deleted file mode 100755
index 54d6d20a3..000000000
--- a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/packages/docmgr/xsl/docs.xsl
+++ /dev/null
@@ -1,588 +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:cms="http://www.arsdigita.com/cms/1.0"
-                xmlns:admin="http://www.arsdigita.com/admin-ui/1.0"
-                xmlns:docs="http://www.redhat.com/docs/1.0">
-  
-
-  <xsl:import href="../../content-section/xsl/cms.xsl"/> 
-  <xsl:import href="../../acs-admin/xsl/admin_en.xsl"/>
-  <xsl:import href="../../categorization/xsl/categorization.xsl"/>
-  <xsl:import href="../../bebop/xsl/DimensionalNavbar.xsl"/>
-  <xsl:import href="../../toolbox/xsl/ControlBar.xsl"/>
-  
-  <xsl:output method="html" indent="yes"/>
-  
-  <xsl:param name="contextPath"/>
-  
-  <xsl:variable name="assets-dir">/packages/portalserver/www/assets</xsl:variable>
-  <xsl:variable name="css-dir">/packages/portalserver/www/css</xsl:variable>
-
-  
-  <xsl:template match="bebop:page[@class='DOCS']" 
-                xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-    <html>
-      <head>
-        <title><xsl:value-of select="bebop:title"/></title>
-        <!--
-        <link href="/css/acs-master.css" rel="stylesheet" type="text/css"/>
-        <link href="/packages/portalserver/www/css/portalserver.css" rel="stylesheet" type="text/css"/>
-        <style type="text/css">
-          BODY { background: white; color: black}
-          .main   {background-color: #ffffff;}
-          table.globalHeader { background-color: rgb(225,225,225);}
-          table.bottomRule { background: rgb(162,30,30);}
-          table.topRuleNoTabs { background: rgb(162,30,30);}
-          table.topRuleUnderTabs { background: rgb(162,30,30);}
-        </style>
-        -->
-        <link rel="stylesheet" type="text/css" href="/css/acs-master.css" />
-        <link rel="stylesheet" type="text/css" href="/__ccm__/static/cms/admin/cms-admin.css" />
-      </head>
-
-      <body>
-        <xsl:apply-templates select="docs:header"/>
-        <xsl:apply-templates select="docs:body"/>
-        <xsl:apply-templates select="docs:footer"/>
-        <xsl:apply-templates select="bebop:structure"/>
-      </body>
-   </html>
- </xsl:template>
-
-
- <!-- ContextBar formatting -->
- <xsl:template match="bebop:boxPanel[@class='ContextBar']">
-   <xsl:apply-imports/>
-   <hr />
- </xsl:template>
- 
- <!-- Table with alternate color for each column. -->
- <xsl:template match="bebop:table[@class='AlternateTable']"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <table>
-     <xsl:for-each select="@*">
-       <xsl:attribute name="{name()}">
-         <xsl:value-of select="."/>
-       </xsl:attribute>
-     </xsl:for-each>
-     <xsl:apply-templates select="bebop:thead"/>
-     <xsl:for-each select="bebop:tbody">
-         <xsl:call-template name="AlternateTableBody"/>
-     </xsl:for-each>
-   </table>
- </xsl:template>
-
- <xsl:template name="AlternateTableBody"
-               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <tbody>
-     <xsl:for-each select="bebop:trow">
-       <tr>
-         <xsl:attribute name="bgcolor">
-            <xsl:choose>
-               <xsl:when test="position() mod 2">#e1d5b0</xsl:when>
-               <xsl:otherwise>#ffffff</xsl:otherwise>
-            </xsl:choose>
-         </xsl:attribute>
-         <xsl:for-each select="bebop:cell">
-           <td>
-             <xsl:for-each select="@align|@valign|@colspan|@width">
-               <xsl:attribute name="{local-name()}">
-                <xsl:value-of select="."/>
-               </xsl:attribute>
-             </xsl:for-each>
-             <xsl:apply-templates/>
-           </td>
-         </xsl:for-each>
-       </tr>
-     </xsl:for-each>
-   </tbody>
- </xsl:template>
-
- <xsl:template match="bebop:label[@class='isFile']">
-    <img src="{$contextPath}/assets/file.gif" border="0">
-       <xsl:attribute name="alt">
-         <xsl:apply-templates/>
-       </xsl:attribute>
-    </img>
-  <xsl:text>&#160;</xsl:text>
- </xsl:template>  
-   
- <xsl:template match="bebop:label[@class='isFolder']">
-    <img src="{$contextPath}/assets/folder.gif" border="0">
-       <xsl:attribute name="alt">
-         <xsl:apply-templates/>
-       </xsl:attribute>
-    </img>
-  <xsl:text>&#160;</xsl:text>
- </xsl:template>     
-
-
- <xsl:template name="write-node">
-   <xsl:param name="node"/>
-   <xsl:param name="total-indent"/>
-   <xsl:param name="level-indent">&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;</xsl:param>
-   <xsl:for-each select="$node">
-     <tr>
-       <td>
-         <xsl:attribute name="class">
-           <xsl:choose>
-             <xsl:when test="count(./bebop:label[@weight='b'])>0">split_pane_left_item_selected</xsl:when>
-             <xsl:otherwise>split_pane_left_item</xsl:otherwise>
-           </xsl:choose>
-         </xsl:attribute>
-         <xsl:value-of disable-output-escaping="yes" select="$total-indent"/>
-
-         <xsl:choose>
-           <xsl:when test="@collapsed='t'">
-             <a href="{@href}">
-               <img alt="Expand" border="0" height="11" width="11">
-                 <xsl:attribute name="src">
-                   <xsl:value-of select="//@assets"/>/assets/plus-box.gif</xsl:attribute>
-               </img>
-             </a>
-           </xsl:when>
-           <xsl:when test="@expanded='t'">
-             <a href="{@href}">
-               <img alt="Collapse" border="0" height="11" width="11">
-                 <xsl:attribute name="src">
-                   <xsl:value-of select="//@assets"/>/assets/minus-box.gif</xsl:attribute>
-               </img>
-             </a>
-           </xsl:when>
-           <xsl:when test="@radioGroup='t'">
-             <input type="radio">
-                <xsl:attribute name="name">
-                  <xsl:value-of select="@radioGroupName"/>
-                 </xsl:attribute>         
-                <xsl:attribute name="value">
-                  <xsl:value-of select="@resourceID"/>
-                 </xsl:attribute>
-             </input>                        
-             <img alt="folder" border="0" height="24" width="24">
-                <xsl:attribute name="src">
-                <xsl:value-of select="//@assets"/>/assets/folder.gif</xsl:attribute>
-             </img>
-           </xsl:when>
-           <xsl:when test="@radioGroup='f'"> 
-             <xsl:text>&#160;&#160;&#160;&#160;
-             </xsl:text>                  
-             <img alt="folder" border="0" height="24" width="24">
-                <xsl:attribute name="src">
-                <xsl:value-of select="//@assets"/>/assets/folder.gif</xsl:attribute>
-             </img>
-           </xsl:when>
-   
-           <xsl:otherwise>
-             <xsl:text>&#160;</xsl:text>
-           </xsl:otherwise>
-         </xsl:choose>
-
-         <xsl:text>&#160;</xsl:text>
-         <xsl:apply-templates select="*[position()=1]"/>
-       </td>
-     </tr>
-     <xsl:for-each select="bebop:t_node">
-       <xsl:call-template name="write-node">
-         <xsl:with-param name="node" select="."/>
-         <xsl:with-param name="total-indent">
-           <xsl:copy-of select="$total-indent"/>
-           <xsl:copy-of select="$level-indent"/>
-         </xsl:with-param>
-       </xsl:call-template>
-     </xsl:for-each>
-
-     <!-- This adds a little space each time we move up in the hierarchy. -->
-     <xsl:if test="count(bebop:t_node)>0">
-       <tr>
-         <td>
-           <table cellspacing="0" cellpadding="0" border="0">
-             <tr>
-               <td height="2"></td>
-             </tr>
-           </table>
-         </td>
-       </tr>
-     </xsl:if>
-   </xsl:for-each>
- </xsl:template>
-
- <xsl:template match="docs:error-label"
-               xmlns:docs="http://www.arsdigita.com/docs/1.0">
-    <xsl:choose>
-        <xsl:when test="@action='copy'">
-           Unable to copy on following items.
-        </xsl:when>
-        <xsl:when test="@action='move'">
-           Unable to move on following items.
-        </xsl:when>
-        <xsl:when test="@action='delete'">
-           Unable to delete on following items.
-        </xsl:when>
-    </xsl:choose>
-    <ul>    
-    <xsl:for-each select="docs:item">
-       <li><b><xsl:value-of select="@name"/></b></li>
-    </xsl:for-each>
-    </ul>
- </xsl:template>
-
- <xsl:template match="docs:file-info">
-   <table>
-     <tr>
-       <td>Name:</td>
-       <td><xsl:value-of select="docs:name"/></td>
-     </tr>
-     <tr>
-       <td>Description:</td>
-       <td><xsl:value-of select="docs:description"/></td>
-     </tr>
-     <tr>
-       <td>Size:</td>
-       <td><xsl:value-of select="docs:size"/></td>
-     </tr>
-     <tr>
-       <td>Type:</td>
-       <td><xsl:value-of select="docs:type"/></td>
-     </tr>
-     <tr>
-       <td>Last Modified:</td>
-       <td><xsl:value-of select="docs:last-modified"/></td>
-     </tr>
-
-     <tr>
-       <td>Revision:</td>
-       <td><xsl:value-of select="docs:revision"/></td>
-     </tr>
-     <tr>
-       <td>Author:</td>
-       <td><xsl:value-of select="docs:author"/></td>
-     </tr>
-
-     <tr>
-       <td>URI:</td>
-       <td>
-         <a href="{docs:uri}">
-           <xsl:value-of select="docs:uri"/>
-         </a>
-       </td>
-     </tr>
-
-   </table>
-
- </xsl:template>
-
- <xsl:template match="docs:header">
-
-  <table id="global-header">
-    <tr>
-      <td id="context">
-        <xsl:if test="bebop:dimensionalNavbar[@class = 'portalNavbar']">
-          <xsl:apply-templates select="bebop:dimensionalNavbar[@class = 'portalNavbar']"/>
-        </xsl:if>
-      </td>
-      <td>
-        <table id="global-links">
-          <tr>
-            <td style="margin: 0; border: 0; padding: 0; padding-right: 18px;">
-            </td>
-            <td class="global-link-icon">
-             <a href="{../docs:global/bebop:link[@class = 'signoutLink']/@href}">
-              <img src="/assets/lock.png" height="18" width="14"/>
-             </a>
-            </td>
-            <td class="global-link">
-             <a href="{../docs:global/bebop:link[@class = 'signoutLink']/@href}">
-               Sign out
-              </a>
-             </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-
-  <table width="100%" cellspacing="0" cellpadding="0" border="0">
-    <tr>
-      <td bgcolor="#878175">
-        <table cellspacing="0" cellpadding="0" border="0">
-          <tr>
-            <td height="1"></td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-
-  <table class="setInside">
-    <tr>
-      <td class="setInside">
-        <table class="localHeader">
-          <tr>
-            <td class="localTitle">
-              <xsl:value-of select="../bebop:title"/>
-            </td>
-            <td class="localControl">
-              <xsl:apply-templates select="bebop:link[@class = 'portalControlProfileLink']"/>
-              <xsl:apply-templates select="bebop:link[@class = 'portalControl']"/>
-            </td>
-          </tr>
-        </table>      
-      </td>
-    </tr>
-  </table>
- </xsl:template>
- 
- <xsl:template match="docs:body">
-   <table class="setInside"><tr><td class="setInside">
-
-    <!-- XXX once we make portal tabs generate XML just like ordinary tabs, this rule repeat can go away. -->
-
-    <xsl:variable name="portalTabs" select="bebop:list[@class = 'portalTabs']"/>
-    <xsl:choose>
-      <xsl:when test="count($portalTabs/bebop:cell) > 1">
-        <!--
-        If there is only one tab in this portal, don't bother to
-        display it.
-        -->
-
-        <table cellpadding="0" cellspacing="0" border="0" class="tabs">
-          <tr valign="bottom">
-            <td class="trimSpace"><xsl:text>&#160;</xsl:text></td>
-            <xsl:for-each select="$portalTabs/bebop:cell">
-              <xsl:choose>
-                <xsl:when test="@selected">
-                  <!-- start currently active tab -->
-                  <td class="tabBeginning"><xsl:text>&#160;&#160;</xsl:text></td>
-                  <td class="activeTab" nowrap="nowrap"><xsl:value-of select="bebop:portal/@title"/></td>
-                    <td class="tabEnd"><xsl:text>&#160;&#160;</xsl:text></td>
-                    <td class="trimSpace"><xsl:text>&#160;</xsl:text></td>
-                  <!-- end currently active tab -->
-                </xsl:when>
-                <xsl:otherwise>
-                  <!-- start inactive tab -->
-                  <td>
-                    <table cellpadding="0" cellspacing="0" border="0">
-                      <tr height="3"><td><img src="/assets/general/spacer.gif" height="3"/></td></tr>
-                      <tr height="23">
-                         <td class="tabBeginningOff"><xsl:text>&#160;&#160;</xsl:text></td>
-                         <td class="inactiveTab" nowrap="nowrap"><xsl:apply-templates select="bebop:link"/></td>
-                      <td class="tabEndOff"><xsl:text>&#160;&#160;</xsl:text></td>
-                      </tr>
-                    </table>
-                    <td class="trimSpace"><xsl:text>&#160;</xsl:text></td>
-                  </td>
-                  <!-- end inactive tab -->
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:for-each>
-            <td class="trimSpace" width="100%"><xsl:text>&#160;</xsl:text></td>
-          </tr>
-        </table>
-
-        <table class="topRuleUnderTabs">
-          <tr><td></td></tr>
-        </table>
-      </xsl:when>
-      <xsl:when test="not(bebop:tabbedPane)">
-        <table class="topRuleNoTabs">
-          <tr><td></td></tr>
-        </table>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:apply-templates/>
-
-  <!-- end of div class="setInside" -->
-  </td></tr></table>
-
-    <table class="bottomRule">
-      <tr><td></td></tr>
-    </table>
-
-</xsl:template>
-
-<xsl:template match="bebop:splitPanel">
-  <table class="splitPanel">
-    <xsl:if test="not(bebop:cell/bebop:label[text() = '&amp;nbsp;'])">
-      <tr>
-        <td colspan="3" class="splitPanelHeader">
-          <table width="100%" cellspacing="4" cellpadding="0" border="0">
-            <tr><td><xsl:apply-templates select="bebop:cell[1]"/></td></tr>
-          </table>
-        </td>
-      </tr>
-      <tr><td colspan="3" class="inactiveTabColor" height="2"><img src="/assets/general/spacer.gif" height="2"/></td></tr>
-    </xsl:if>
-    <tr>
-      <td class="splitPanelLeft">
-        <table width="100%" cellspacing="4" cellpadding="0" border="0">
-          <tr><td><xsl:apply-templates select="bebop:cell[2]"/></td></tr>
-        </table>
-      </td>
-      <td class="inactiveTabColor" width="2"><img src="/assets/general/spacer.gif" width="2"/></td>
-      <td class="splitPanelRight">
-        <table width="100%" cellspacing="4" cellpadding="0" border="0">
-          <tr><td><xsl:apply-templates select="bebop:cell[3]"/></td></tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</xsl:template>
-
-<xsl:template match="bebop:tabbedPane">
-  <xsl:variable name="tabs" select="bebop:tabStrip/bebop:tab"/>
-
-  <table cellpadding="0" cellspacing="0" border="0" class="tabs">
-    <tr>
-      <td class="trimSpace"><xsl:text>&#160;</xsl:text></td>
-      <xsl:for-each select="$tabs">
-        <xsl:choose>
-          <xsl:when test="@current = 't'">
-            <!-- start currently active tab -->
-            <td class="tabBeginning"><xsl:text>&#160;&#160;</xsl:text></td>
-            <td class="activeTab" nowrap="nowrap"><xsl:value-of select="bebop:label"/></td>
-            <td class="tabEnd"><xsl:text>&#160;&#160;</xsl:text></td>
-            <td class="trimSpace"><xsl:text>&#160;</xsl:text></td>
-            <!-- end currently active tab -->
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- start inactive tab -->
-            <td>
-              <table cellpadding="0" cellspacing="0" border="0">
-                <tr height="3"><td></td></tr>
-                <tr height="23">
-                  <td class="tabBeginningOff"><xsl:text>&#160;&#160;</xsl:text></td>
-                  <td class="inactiveTab" nowrap="nowrap"><a href="{@href}"><xsl:apply-templates select="bebop:label"/></a>
-                  </td>
-                  <td class="tabEndOff"><xsl:text>&#160;&#160;</xsl:text></td>
-                </tr>
-                </table>
-               <td class="trimSpace"><xsl:text>&#160;</xsl:text></td>
-            </td>
-            <!-- end inactive tab -->
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-      <td class="trimSpace" width="100%"><xsl:text>&#160;</xsl:text></td>
-    </tr>
-  </table>
-
-  <table class="topRuleUnderTabs">
-    <tr><td></td></tr>
-  </table>
-
-  <xsl:apply-templates select="bebop:currentPane/*"/>
-</xsl:template>
-
-<xsl:template match="bebop:table"
-              xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
- <table class="fancy">
-   <xsl:for-each select="@*">
-     <xsl:attribute name="{name()}">
-       <xsl:value-of select="."/>
-     </xsl:attribute>
-   </xsl:for-each>
-   <xsl:apply-templates select="bebop:thead"/>
-   <xsl:apply-templates select="bebop:tbody"/>
- </table>
-</xsl:template>
-
-<xsl:template match="bebop:table[@class='plain']"
-              xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
-   <table>
-     <xsl:for-each select="@*">
-       <xsl:attribute name="{name()}">
-         <xsl:value-of select="."/>
-       </xsl:attribute>
-     </xsl:for-each>
-     <xsl:apply-templates select="bebop:thead"/>
-     <xsl:apply-templates select="bebop:tbody"/>
-   </table>
-</xsl:template>
-
-<!-- The template below overrides bebop Link.xsl action link spec so that
-we can have a different image -->
-<xsl:template name="bebop:actionLink" match="bebop:link[@class='actionLink']">
-       <!-- Begin Image -->
-
-       <!-- Image JavaScript  -->
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-
-       <!-- This is ugly, but I need the whole output on one line =p -->
-       <![CDATA[ document.write(']]><a href="{@href}" onclick="{@onclick}"><img src="{$contextPath}/assets/action-generic.png" border="0" width="11" height="11"><xsl:attribute name="alt"><xsl:apply-templates mode="javascript-mode"/></xsl:attribute></img><![CDATA[')]]>
-       <![CDATA[ document.write(']]></a><![CDATA[')]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <!-- Image No JavaScript  -->
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[document.write("\<!--") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <a href="{@href_no_javascript}">
-         <img src="{$contextPath}/assets/action-generic.png" border="0" width="11" height="11">
-           <xsl:attribute name="alt">
-             <xsl:apply-templates/>
-           </xsl:attribute>
-         </img>
-       </a>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[document.write("\<!--") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <!-- Begin Link -->
-
-       <xsl:text>&#160;</xsl:text>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-
-       <!-- This is ugly, but I need the whole output on one line =p -->
-       <![CDATA[ document.write(']]><a><xsl:for-each select="@*[name() != 'href_no_javascript']"><xsl:attribute name="{name()}"><xsl:value-of select="."/></xsl:attribute></xsl:for-each><xsl:apply-templates mode="javascript-mode"/><![CDATA[')]]>
-       <![CDATA[ document.write(']]></a><![CDATA[')]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[document.write("\<!--") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-       <a>
-        <xsl:for-each select="@*[name() != 'href']">
-            <xsl:choose>
-             <xsl:when test="name() = 'href_no_javascript'">
-              <xsl:attribute name="href">
-               <xsl:value-of select="."/>
-              </xsl:attribute>
-             </xsl:when>
-             <xsl:when test="name() = 'onclick'">
-             </xsl:when>
-             <xsl:otherwise>
-              <xsl:attribute name="{name()}">
-               <xsl:value-of select="."/>
-              </xsl:attribute>
-             </xsl:otherwise>
-            </xsl:choose>
-        </xsl:for-each>
-        <xsl:apply-templates />
-       </a>
-
-       <script LANGUAGE="JavaScript">
-       <![CDATA[ <!-- begin script ]]>
-       <![CDATA[ document.write("--\>") ]]>
-       <![CDATA[ // end script --> ]]>
-       </script>
-</xsl:template>
-
-
-</xsl:stylesheet>
diff --git a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/packages/docmgr/xsl/docs_en.xsl b/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/packages/docmgr/xsl/docs_en.xsl
deleted file mode 100755
index 357dcb091..000000000
--- a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/packages/docmgr/xsl/docs_en.xsl
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:admin="http://www.arsdigita.com/docs-ui/1.0"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  exclude-result-prefixes="admin">
-
-<xsl:import href="docs.xsl"/>
- 
-  <!-- this rule matches one user -->
-  <xsl:template match="admin:userInfo">
-    
-    <!-- Feature #166221 capitalize form labels -->
-    <ul>
-      <li> Name: <xsl:value-of select="@name"/> </li>
-      <li> Email: 
-	<table>
-	  <xsl:apply-templates select="admin:email" />
-	</table>
-      </li>
-      <li> Screen Name:  <xsl:value-of select="@screenName"/> </li>
-      <li> URL: <a href="{@URI}"><xsl:value-of select="@URI"/> </a> </li>
-      <li> User ID:  <xsl:value-of select="@id"/> </li>
-      <li> Member State: <xsl:value-of select="@memberState"/> 
-      </li>
-    </ul>
-    
-  </xsl:template>
-  
-  <!-- used to format the list of actions available for one user -->
-  <xsl:template match="admin:userActions">
-    
-    <h3>Adminstrative Actions</h3>
-    
-    <ul>
-      <li><a href="password-update?user_id={@id}">Update password</a></li>
-      <li><a href="login?user_id={@id}">Become this user</a></li>
-    </ul>
-    
-  </xsl:template>
-  
-  <!-- used to format the header of the password update page -->
-  <xsl:template match="bebop:label[@class='UserPasswordHeader']">
-    For <xsl:value-of select="text()"/>
-    <hr />
-  </xsl:template>
-  
-  <!-- usage note displayed on the password-update page -->
-  <xsl:template match="admin:PasswordNote">
-    <h4>Note</h4>
-    <p>If this user does not currently have an authentication record,
-      one will be created when you submit this form and the account
-      will be enabled for login to the system.</p>
-  </xsl:template>
-
-  <!-- used to format primary email for display -->
-  <xsl:template match="admin:email[@primary='t']">
-    <tr>
-      <td>
-        <a href="mailto:{@address}"><xsl:value-of select="@address"/></a>
-      </td>
-      <td>
-        (primary)
-      </td>
-    </tr>
-  </xsl:template>
-  
-  <!-- used to format non-primary email for display -->
-  <xsl:template match="admin:email">
-    <tr>
-      <td>
-        <a href="mailto:{@address}"><xsl:value-of select="@address"/></a>
-      </td>
-      <td>
-      </td>
-    </tr>
-  </xsl:template>
-
-
-<!-- Access Denied Page -->
-<xsl:template match="bebop:label[@class='AccessDenied']">
-  <hr />
-  <p>You don't have permission to perform the requested action.</p>
-  <hr />
-</xsl:template>
-
-<!-- Display search error message -->
-<xsl:template match="bebop:list[@class='SearchResultList'][count(bebop:cell)=0]">
-   <p><font color="red">Your search returned no results.</font></p>
-</xsl:template>
-
-<!-- Display search error message -->
-<xsl:template match="bebop:list[@class='SearchResultList'][count(bebop:cell)>0]">
-    <p>Results matching your query:</p>
-    <ul>
-      <xsl:for-each select="bebop:cell">
-        <li><xsl:apply-templates/></li>
-      </xsl:for-each>
-    </ul>
-</xsl:template>
-
-<!-- used to format the basic information and actions available for one group -->
-<xsl:template match="admin:groupInfo">
-
-<ul>
-  <li> Group Name: <xsl:value-of select="@name"/> </li>
-  <li> Primary Email: <xsl:value-of select="@email"/> </li>
-</ul>
-
-</xsl:template>
-
-<xsl:template match="bebop:list[@class='UserGroupsResultList'][count(bebop:cell)=0]">
-   <p><font color="red">None</font></p>
-</xsl:template>
-  
-<xsl:template match="bebop:link[@class='deleteLink']">
-  <xsl:text>&#160;</xsl:text>
-  (<a href="{@href}" onclick="{@onclick}" class="action_link">
-    <xsl:apply-templates/>
-  </a>)
-</xsl:template>
-
-</xsl:stylesheet>
-
-
diff --git a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/static/content-types/com/arsdigita/cms/docmgr/DocLink.xsl b/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/static/content-types/com/arsdigita/cms/docmgr/DocLink.xsl
deleted file mode 100755
index 4e0269e32..000000000
--- a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/static/content-types/com/arsdigita/cms/docmgr/DocLink.xsl
+++ /dev/null
@@ -1,10 +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:cms="http://www.arsdigita.com/cms/1.0"
-                version="1.0">
-
-</xsl:stylesheet>
-
diff --git a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/static/content-types/com/arsdigita/cms/docmgr/Document.xsl b/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/static/content-types/com/arsdigita/cms/docmgr/Document.xsl
deleted file mode 100755
index 4e0269e32..000000000
--- a/ccm-docmgr/debian/ccm-docmgr/usr/share/java/webapps/ccm-docmgr-6.3.0/ROOT/static/content-types/com/arsdigita/cms/docmgr/Document.xsl
+++ /dev/null
@@ -1,10 +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:cms="http://www.arsdigita.com/cms/1.0"
-                version="1.0">
-
-</xsl:stylesheet>
-
diff --git a/ccm-docmgr/web/packages/docmgr/xsl/docs.xsl b/ccm-docmgr/web/packages/docmgr/xsl/docs.xsl
index 54d6d20a3..c4ea5d293 100755
--- a/ccm-docmgr/web/packages/docmgr/xsl/docs.xsl
+++ b/ccm-docmgr/web/packages/docmgr/xsl/docs.xsl
@@ -513,7 +513,7 @@ we can have a different image -->
        <![CDATA[ <!-- begin script ]]>
 
        <!-- This is ugly, but I need the whole output on one line =p -->
-       <![CDATA[ document.write(']]><a href="{@href}" onclick="{@onclick}"><img src="{$contextPath}/assets/action-generic.png" border="0" width="11" height="11"><xsl:attribute name="alt"><xsl:apply-templates mode="javascript-mode"/></xsl:attribute></img><![CDATA[')]]>
+       <![CDATA[ document.write(']]><a href="{@href}" onclick="{@onclick}"><img src="{$contextPath}/assets/images/action-generic.png" border="0" width="11" height="11"><xsl:attribute name="alt"><xsl:apply-templates mode="javascript-mode"/></xsl:attribute></img><![CDATA[')]]>
        <![CDATA[ document.write(']]></a><![CDATA[')]]>
        <![CDATA[ // end script --> ]]>
        </script>
@@ -526,7 +526,7 @@ we can have a different image -->
        </script>
 
        <a href="{@href_no_javascript}">
-         <img src="{$contextPath}/assets/action-generic.png" border="0" width="11" height="11">
+         <img src="{$contextPath}/assets/images/action-generic.png" border="0" width="11" height="11">
            <xsl:attribute name="alt">
              <xsl:apply-templates/>
            </xsl:attribute>
diff --git a/ccm-forum/web/packages/forum/xsl/forum.xsl b/ccm-forum/web/packages/forum/xsl/forum.xsl
index e4052b92c..6eb32e53b 100755
--- a/ccm-forum/web/packages/forum/xsl/forum.xsl
+++ b/ccm-forum/web/packages/forum/xsl/forum.xsl
@@ -182,7 +182,7 @@
             <th width="100%" class="{status}">
               <xsl:if test="@approveURL">
                 <nobr>
-                  <a href="{@approveURL}"><img border="0" src="/assets/action-generic.png"/></a>
+                  <a href="{@approveURL}"><img border="0" src="/assets/images/action-generic.png"/></a>
                   <xsl:text>&#160;</xsl:text>
                   <a href="{@approveURL}">Approve</a>
                   <xsl:text>&#160;</xsl:text>
@@ -190,7 +190,7 @@
               </xsl:if>
               <xsl:if test="@rejectURL">
                 <nobr>
-                  <a href="{@rejectURL}"><img border="0" src="/assets/action-generic.png"/></a>
+                  <a href="{@rejectURL}"><img border="0" src="/assets/images/action-generic.png"/></a>
                   <xsl:text>&#160;</xsl:text>
                   <a href="{@rejectURL}">Reject</a>
                   <xsl:text>&#160;</xsl:text>
@@ -205,7 +205,7 @@
             <xsl:if test="@editURL">
               <th>
                 <nobr>
-                  <a href="{@editURL}"><img border="0" src="/assets/action-generic.png"/></a>
+                  <a href="{@editURL}"><img border="0" src="/assets/images/action-generic.png"/></a>
                   <xsl:text>&#160;</xsl:text>
                   <a href="{@editURL}">Edit</a>
                 </nobr>
@@ -214,7 +214,7 @@
             <xsl:if test="@replyURL">
               <th>
                 <nobr>
-                  <a href="{@replyURL}"><img border="0" src="/assets/action-generic.png"/></a>
+                  <a href="{@replyURL}"><img border="0" src="/assets/images/action-generic.png"/></a>
                   <xsl:text>&#160;</xsl:text>
                   <a href="{@replyURL}">Reply</a>
                 </nobr>
@@ -223,7 +223,7 @@
             <xsl:if test="@deleteURL">
               <th>
                 <nobr>
-                  <a href="{@deleteURL}"><img border="0" src="/assets/action-generic.png"/></a>
+                  <a href="{@deleteURL}"><img border="0" src="/assets/images/action-generic.png"/></a>
                   <xsl:text>&#160;</xsl:text>
                   <a href="{@deleteURL}">Delete</a>
                 </nobr>
diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl
index 026e60e21..a77f999ce 100644
--- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl
+++ b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl
@@ -35,12 +35,12 @@
 	      <xsl:if test="@addAction">
 	        <script LANGUAGE="JavaScript">
 	          <![CDATA[ <!-- begin script ]]>
-	          <![CDATA[ document.write('<a href="]]><xsl:value-of select="@addJSAction"/><![CDATA["><img src="/assets/action-add.png" border="0"/></a>')]]>
+	          <![CDATA[ document.write('<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/action-add.png" border="0"/>
+	          <img src="/assets/category-step/action-add.png" border="0"/>
 	        </a>
 	        <script LANGUAGE="JavaScript">
 	          <![CDATA[ <!-- begin script ]]>
@@ -78,7 +78,7 @@
 	              <li>
 	                <xsl:value-of select="substring(@path, string-length($name) + 5)"/>&#160;
 	                <xsl:if test="@deleteAction">
-	                  <a href="{@deleteAction}"><img src="/assets/action-delete.png" border="0"/></a>
+	                  <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>
@@ -112,10 +112,10 @@
 
         if (elChildren.style.display != "block") {
            elChildren.style.display = "block";
-           elImg.src = "/assets/action-delete.png";
+           elImg.src = "/assets/category-step/action-delete.png";
         } else {
            elChildren.style.display = "none";
-           elImg.src = "/assets/action-add.png";
+           elImg.src = "/assets/category-step/action-add.png";
         }
         return true;
       }
@@ -205,14 +205,14 @@
 	      <xsl:choose>
 	        <xsl:when test="count(forum:category[@isEnabled = '1']) > 0 and $expand='none'">
 	          <a href="#" onClick="catToggle('{@nodeID}');">
-	             <img id="catTog{@nodeID}" src="/assets/action-add.png" width="14" height="14" border="0"/></a>
+	             <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/action-delete.png" 
+	          <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/action-generic.png" width="14" height="14" border="0"/>
+	          <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}">
diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/portal/content-sections-portlet.xsl b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/portal/content-sections-portlet.xsl
index ac46d0cde..a38288f70 100755
--- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/portal/content-sections-portlet.xsl
+++ b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/portal/content-sections-portlet.xsl
@@ -18,7 +18,7 @@
   </div>
   <div>
     <a href="{@url}admin/index.jsp">
-      <img border="0" width="11" height="11" alt="admin" src="{$context-prefix}/assets/arrow-box.gif"/>
+      <img border="0" width="11" height="11" alt="admin" src="{$context-prefix}/assets/images/arrow-box.gif"/>
     </a>
     <a href="{@url}admin/index.jsp" class="action_link">admin</a>
   </div>
diff --git a/ccm-ldn-atoz/web/__ccm__/apps/atoz/xsl/index.xsl b/ccm-ldn-atoz/web/__ccm__/apps/atoz/xsl/index.xsl
index 54fdf2e14..c082918d4 100755
--- a/ccm-ldn-atoz/web/__ccm__/apps/atoz/xsl/index.xsl
+++ b/ccm-ldn-atoz/web/__ccm__/apps/atoz/xsl/index.xsl
@@ -235,7 +235,7 @@
 
   <xsl:template match="cms:categoryWidget" mode="cms:javascript">
     <script type="text/javascript" src="/assets/prototype.js"/>
-    <script type="text/javascript" src="/assets/category-step.js"/>
+    <script type="text/javascript" src="/assets/category-step/category-step.js"/>
     <script type="text/javascript" src="/resource/ccm-ldn-atoz/__ccm__/static/atoz/category-widget.js"/>
     <div>
       <xsl:apply-templates select="cms:category" mode="cms:javascriptCat">
@@ -632,7 +632,7 @@
     <xsl:param name="type" select="'generic'"/>
 
     <a href="{$url}">
-      <img src="/assets/action-{$type}.png" border="0" width="14" height="14">
+      <img src="/assets/category-step/action-{$type}.png" border="0" width="14" height="14">
         <xsl:attribute name="alt">
           <xsl:choose>
             <xsl:when test="$type = 'delete'">
diff --git a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.xsl b/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.xsl
index 430ea9bb6..c443ff691 100755
--- a/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.xsl
+++ b/ccm-ldn-navigation/web/__ccm__/apps/navigation/lib/quick-link-listing.xsl
@@ -43,11 +43,11 @@
         </tr>
         <tr class="{$class}">
           <td>
-            <a href="{nav:action[@name='edit']/@url}"><img src="/assets/action-generic.png" width="14" height="14" border="0"/></a>
+            <a href="{nav:action[@name='edit']/@url}"><img src="/__ccm__/static/cms/admin/action-group/action-generic.png" width="14" height="14" border="0"/></a>
             <a href="{nav:action[@name='edit']/@url}">Edit</a>
           </td>
           <td>
-            <a href="{nav:action[@name='delete']/@url}"><img src="/assets/action-delete.png" width="14" height="14" border="0"/></a>
+            <a href="{nav:action[@name='delete']/@url}"><img src="/__ccm__/static/cms/admin/action-group/action-delete.png" width="14" height="14" border="0"/></a>
             <a href="{nav:action[@name='delete']/@url}">Delete</a>
           </td>
         </tr>
diff --git a/ccm-ldn-portal/web/packages/workspace/xsl/content-sections-portlet.xsl b/ccm-ldn-portal/web/packages/workspace/xsl/content-sections-portlet.xsl
index 8304e0586..dda9540d8 100755
--- a/ccm-ldn-portal/web/packages/workspace/xsl/content-sections-portlet.xsl
+++ b/ccm-ldn-portal/web/packages/workspace/xsl/content-sections-portlet.xsl
@@ -13,7 +13,7 @@
   </td>
   <td class="table_cell">
     <a href="{@url}admin/index.jsp">
-      <img border="0" width="11" height="11" alt="admin" src="{$root-context-prefix}/assets/arrow-box.gif"/>
+      <img border="0" width="11" height="11" alt="admin" src="{$root-context-prefix}/assets/images/arrow-box.gif"/>
     </a>
     <a href="{@url}admin/index.jsp" class="action_link">admin</a>
   </td>
diff --git a/ccm-ldn-terms/web/__ccm__/apps/terms/lib/domain-details.xsl b/ccm-ldn-terms/web/__ccm__/apps/terms/lib/domain-details.xsl
index 87384d78a..9b53af3b0 100755
--- a/ccm-ldn-terms/web/__ccm__/apps/terms/lib/domain-details.xsl
+++ b/ccm-ldn-terms/web/__ccm__/apps/terms/lib/domain-details.xsl
@@ -49,10 +49,10 @@
         <tr>
           <td>&nbsp;</td>
           <td>
-            <a href="{terms:action[@name='edit']/@url}"><img src="/assets/action-generic.png" width="14" height="14" border="0"/></a>
+            <a href="{terms:action[@name='edit']/@url}"><img src="/__ccm__/static/cms/admin/action-group/action-generic.png" width="14" height="14" border="0"/></a>
             <a href="{terms:action[@name='edit']/@url}">Edit</a>
             <xsl:text>&#160;</xsl:text>
-            <a href="{terms:action[@name='delete']/@url}"><img src="/assets/action-delete.png" width="14" height="14" border="0"/></a>
+            <a href="{terms:action[@name='delete']/@url}"><img src="/__ccm__/static/cms/admin/action-group/action-delete.png" width="14" height="14" border="0"/></a>
             <a href="{terms:action[@name='delete']/@url}">Delete</a>
             <xsl:text>&nbsp;</xsl:text>
           </td>
diff --git a/ccm-ldn-terms/web/__ccm__/apps/terms/lib/term-details.xsl b/ccm-ldn-terms/web/__ccm__/apps/terms/lib/term-details.xsl
index b10a7bb4f..7c152555f 100755
--- a/ccm-ldn-terms/web/__ccm__/apps/terms/lib/term-details.xsl
+++ b/ccm-ldn-terms/web/__ccm__/apps/terms/lib/term-details.xsl
@@ -35,10 +35,10 @@
         <tr>
           <td></td>
           <td>
-            <a href="{terms:action[@name='edit']/@url}"><img src="/assets/action-generic.png" width="14" height="14" border="0"/></a>
+            <a href="{terms:action[@name='edit']/@url}"><img src="/assets/images/action-generic.png" width="14" height="14" border="0"/></a>
             <a href="{terms:action[@name='edit']/@url}">Edit</a>
             <xsl:text>&#160;</xsl:text>
-            <a href="{terms:action[@name='delete']/@url}"><img src="/assets/action-delete.png" width="14" height="14" border="0"/></a>
+            <a href="{terms:action[@name='delete']/@url}"><img src="/assets/images/action-delete.png" width="14" height="14" border="0"/></a>
             <a href="{terms:action[@name='delete']/@url}">Delete</a>
             <xsl:text>&#160;</xsl:text>
           </td>
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeApplication.java b/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeApplication.java
index d03b39a55..39d95f339 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeApplication.java
+++ b/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeApplication.java
@@ -71,7 +71,7 @@ public class ThemeApplication extends Application {
 
 //  /*
 //   * Application specific method only required if installed in its own
-//   * web application context
+//   * web application context (which is deprecated now as of version 6.5)
 //   */
 //  public String getContextPath() {
 //      return "/ccm-ldn-theme";
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig.java b/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig.java
index 60298a642..ce2dcf4a6 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig.java
+++ b/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig.java
@@ -66,7 +66,8 @@ public class ThemeConfig extends AbstractConfig {
 
         m_defaultThemeContext = new StringParameter
             ("com.arsdigita.london.theme.default_theme_context", 
-             Parameter.OPTIONAL, "/ccm-ldn-theme/");
+             Parameter.OPTIONAL, "");
+//           Parameter.OPTIONAL, "/ccm-ldn-theme/");
 
         m_defaultThemePath = new StringParameter
             ("com.arsdigita.london.theme.default_theme_path", 
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/dispatcher/ThemeDownloadServlet.java b/ccm-ldn-theme/src/com/arsdigita/london/theme/dispatcher/ThemeDownloadServlet.java
index 54770272d..f2ceca922 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/dispatcher/ThemeDownloadServlet.java
+++ b/ccm-ldn-theme/src/com/arsdigita/london/theme/dispatcher/ThemeDownloadServlet.java
@@ -306,7 +306,8 @@ public class ThemeDownloadServlet extends BaseServlet implements ThemeConstants
                                 compressed + "; ratio = " + ratio);
                 }
             } catch (IOException e) {
-                throw new UncheckedWrapperException("Error reading from " + filePath + " or writing to the zip file");
+                throw new UncheckedWrapperException("Error reading from " +
+                              filePath + " or writing to the zip file");
             }
         }
     }
diff --git a/ccm-simplesurvey/web/packages/simplesurvey/xsl/simplesurvey.xsl b/ccm-simplesurvey/web/packages/simplesurvey/xsl/simplesurvey.xsl
index 2fdc2038b..647fad80a 100755
--- a/ccm-simplesurvey/web/packages/simplesurvey/xsl/simplesurvey.xsl
+++ b/ccm-simplesurvey/web/packages/simplesurvey/xsl/simplesurvey.xsl
@@ -4,11 +4,11 @@
         xmlns:simplesurvey="http://www.arsdigita.com/simplesurvey/1.0"
         xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
 
-   <!-- IMPORT DEFINITIONS ccm-ldn-shortcuts installed as separate web application
+   <!-- IMPORT DEFINITIONS ccm-simplesurvey installed as separate web application
    <xsl:import href="../../../../ROOT/packages/content-section/xsl/cms.xsl"/> 
    -->
 
-   <!-- IMPORT DEFINITIONS ccm-ldn-shortcuts installed into the main CCM webapp
+   <!-- IMPORT DEFINITIONS ccm-simplesurvey installed into the main CCM webapp
    -->
    <xsl:import href="../../../packages/content-section/xsl/cms.xsl"/>