diff --git a/ccm-docrepo/web/packages/docrepo/xsl/docrepo.xsl b/ccm-docrepo/web/packages/docrepo/xsl/docrepo.xsl
index 91fe9ae0e..64f864565 100644
--- a/ccm-docrepo/web/packages/docrepo/xsl/docrepo.xsl
+++ b/ccm-docrepo/web/packages/docrepo/xsl/docrepo.xsl
@@ -17,7 +17,7 @@
 <xsl:output method="html" indent="yes"/>
 
 <xsl:param name="contextPath"/>
-
+<!-- not used in docrepo xsl. may be a copy&paste error  -->
 <xsl:variable name="assets-dir">/packages/portalserver/www/assets</xsl:variable>
 <xsl:variable name="css-dir">/packages/portalserver/www/css</xsl:variable>
 
diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/Icons.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/Icons.java
index 946da76ba..d0f3d0a7b 100755
--- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/Icons.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/Icons.java
@@ -18,6 +18,13 @@ package com.arsdigita.portalworkspace.ui;
 import com.arsdigita.bebop.Image;
 import org.apache.log4j.Logger;
 
+// ////////////////////////////////////////////////////////////////////
+
+// This class is AWFULL! Images are part of the theme, not of the code.
+// Should be removed as soon as possible (pboy)
+
+// ////////////////////////////////////////////////////////////////////
+
 /**
  * This class contains Images for the various CW icons.  These image
  * instances are all locked, so they may not be directly added to a
@@ -44,61 +51,61 @@ public class Icons {
 
     static {
         logger.debug("Static initalizer starting...");
-        USER_16 = new Image("/packages/workspace/www/assets/User16.gif");
+        USER_16 = new Image("/themes/heirloom/packages/portal-workspace/images/User16.gif");
         USER_16.setBorder("0");
         USER_16.lock();
 
-        GROUP_16 = new Image("/packages/workspace/www/assets/Group16.gif");
+        GROUP_16 = new Image("/themes/heirloom/packages/portal-workspace/images/Group16.gif");
         GROUP_16.setBorder("0");
         GROUP_16.lock();
 
-        LEFT_16 = new Image("/packages/workspace/www/assets/left.gif");
+        LEFT_16 = new Image("/themes/heirloom/packages/portal-workspace/images/left.gif");
         LEFT_16.setBorder("0");
         LEFT_16.lock();
 
-        RIGHT_16 = new Image("/packages/workspace/www/assets/right.gif");
+        RIGHT_16 = new Image("/themes/heirloom/packages/portal-workspace/images/right.gif");
         RIGHT_16.setBorder("0");
         RIGHT_16.lock();
 
-        UP_16 = new Image("/packages/workspace/www/assets/up.gif");
+        UP_16 = new Image("/themes/heirloom/packages/portal-workspace/images/up.gif");
         UP_16.setBorder("0");
         UP_16.lock();
 
-        DOWN_16 = new Image("/packages/workspace/www/assets/down.gif");
+        DOWN_16 = new Image("/themes/heirloom/packages/portal-workspace/images/down.gif");
         DOWN_16.setBorder("0");
         DOWN_16.lock();
 
         RADIO_EMPTY_16 =
-            new Image("/packages/workspace/www/assets/RadioEmpty16.gif");
+            new Image("/themes/heirloom/packages/portal-workspace/imagesRadioEmpty16.gif");
         RADIO_EMPTY_16.setBorder("0");
         RADIO_EMPTY_16.lock();
 
         RADIO_FULL_16 =
-            new Image("/packages/workspace/www/assets/RadioFull16.gif");
+            new Image("/themes/heirloom/packages/portal-workspace/images/RadioFull16.gif");
         RADIO_FULL_16.setBorder("0");
         RADIO_FULL_16.lock();
 
         RADIO_EMPTY_GRAYED_16 =
-            new Image("/packages/workspace/www/assets/RadioEmptyGrayed16.gif");
+            new Image("/themes/heirloom/packages/portal-workspace/images/RadioEmptyGrayed16.gif");
         RADIO_EMPTY_GRAYED_16.setBorder("0");
         RADIO_EMPTY_GRAYED_16.lock();
 
         RADIO_FULL_GRAYED_16 =
-            new Image("/packages/workspace/www/assets/RadioFullGrayed16.gif");
+            new Image("/themes/heirloom/packages/portal-workspace/images/RadioFullGrayed16.gif");
         RADIO_FULL_GRAYED_16.setBorder("0");
         RADIO_FULL_GRAYED_16.lock();
 
         CHECK_EMPTY_16 =
-            new Image("/packages/workspace/www/assets/CheckEmpty16.gif");
+            new Image("/themes/heirloom/packages/portal-workspace/images/CheckEmpty16.gif");
         CHECK_EMPTY_16.setBorder("0");
         CHECK_EMPTY_16.lock();
 
         CHECK_FULL_16 =
-            new Image("/packages/workspace/www/assets/CheckFull16.gif");
+            new Image("/themes/heirloom/packages/portal-workspace/images/CheckFull16.gif");
         CHECK_FULL_16.setBorder("0");
         CHECK_FULL_16.lock();
 
-        TRASH_16 = new Image("/packages/workspace/www/assets/delete.gif");
+        TRASH_16 = new Image("/themes/heirloom/packages/portal-workspace/images/delete16.gif");
         TRASH_16.setBorder("0");
         TRASH_16.lock();
         logger.debug("Static initalizer finished.");
diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantEdit.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantEdit.java
index 34df5bd60..9c2ff9b5a 100755
--- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantEdit.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ParticipantEdit.java
@@ -17,7 +17,7 @@ package com.arsdigita.portalworkspace.ui;
 
 import com.arsdigita.bebop.*;
 import com.arsdigita.bebop.event.*;
-import com.arsdigita.bebop.form.*;
+// import com.arsdigita.bebop.form.*;
 import com.arsdigita.kernel.*;
 import com.arsdigita.kernel.permissions.*;
 import com.arsdigita.bebop.list.ListModel;
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/CheckEmpty16.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/CheckEmpty16.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/CheckEmpty16.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/CheckEmpty16.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/CheckFull16.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/CheckFull16.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/CheckFull16.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/CheckFull16.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/Group16.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/Group16.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/Group16.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/Group16.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/RadioEmpty16.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/RadioEmpty16.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/RadioEmpty16.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/RadioEmpty16.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/RadioFull16.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/RadioFull16.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/RadioFull16.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/RadioFull16.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/User16.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/User16.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/User16.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/User16.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/customize.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/customize.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/customize.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/customize.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/delete.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/delete.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/delete.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/delete.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/delete.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/delete16.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/delete.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/delete16.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/display.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/display.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/display.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/display.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/down.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/down.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/down.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/down.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/left.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/left.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/left.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/left.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveDown.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/moveDown.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveDown.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/moveDown.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveLeft.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/moveLeft.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveLeft.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/moveLeft.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveRight.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/moveRight.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveRight.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/moveRight.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveUp.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/moveUp.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveUp.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/moveUp.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/right.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/right.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/right.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/right.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/up.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/up.gif
similarity index 100%
rename from ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/up.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/images/up.gif
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/admin.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/admin.xsl
index 99468e09c..eecf366b5 100755
--- a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/admin.xsl
+++ b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/admin.xsl
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:admin="http://www.arsdigita.com/admin-ui/1.0"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0">
+              xmlns:admin="http://www.arsdigita.com/admin-ui/1.0"
+              xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+             xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
+            xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0">
   
   <!-- rules needed to process the admin components properly. -->
   
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/lib.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/lib.xsl
index da0d87f10..6b50ce3d9 100755
--- a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/lib.xsl
+++ b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/lib.xsl
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-  xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
-  xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
+              xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+             xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
+            xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
   version="1.0">
 
 
@@ -46,7 +46,7 @@
                   </xsl:variable>
                   
                   <a href="{@url}" title="{$title}">
-                    <img src="{@name}.gif" border="0" alt="{$title}"/>
+                    <img src="../images/{@name}.gif" border="0" alt="{$title}"/>
                   </a>
                 </th>
               </xsl:for-each>
@@ -151,16 +151,16 @@
       <xsl:when test="@isSelected = 'false'">
         <td class="tab-label">
           <a href="{@moveLeftAction}">
-            <img src="moveLeft.gif" border="0" style="margin-left: 5px"/>
+            <img src="../images/moveLeft.gif" border="0" style="margin-left: 5px"/>
           </a>
           <a href="{@moveRightAction}">
-            <img src="moveRight.gif" border="0" style="margin-left: 5px"/>
+            <img src="../images/moveRight.gif" border="0" style="margin-left: 5px"/>
           </a>
           <a href="{@selectAction}">
             <xsl:value-of select="title"/>
           </a>
           <a href="{@deleteAction}" onclick="return confirm('Are you sure you want to delete this pane')">
-            <img src="delete.gif" border="0" style="margin-left: 5px"/>
+            <img src="../images/delete.gif" border="0" style="margin-left: 5px"/>
           </a>
         </td>
         <td class="tab-end"/>
@@ -172,12 +172,12 @@
             <tr>
               <td>
                 <a href="{@moveLeftAction}">
-                  <img src="moveLeft.gif" border="0" style="margin-left: 5px"/>
+                  <img src="../images/moveLeft.gif" border="0" style="margin-left: 5px"/>
                 </a>
               </td>
               <td>
                 <a href="{@moveRightAction}">
-                  <img src="moveRight.gif" border="0" style="margin-left: 5px"/>
+                  <img src="../images/moveRight.gif" border="0" style="margin-left: 5px"/>
                 </a>
               </td>
               <td>
@@ -185,7 +185,7 @@
               </td>
               <td>
                 <a href="{@deleteAction}" onclick="return confirm('Are you sure you want to delete this pane')">
-                  <img src="delete.gif" border="0" style="margin-left: 5px"/>
+                  <img src="../images/delete.gif" border="0" style="margin-left: 5px"/>
                 </a>
               </td>
             </tr>
@@ -197,14 +197,14 @@
       <xsl:otherwise>
         <td class="current-tab-label">
           <a href="{@moveLeftAction}">
-            <img src="moveLeft.gif" border="0" style="margin-left: 5px"/>
+            <img src="../images/moveLeft.gif" border="0" style="margin-left: 5px"/>
           </a>
           <a href="{@moveRightAction}">
-            <img src="moveRight.gif" border="0" style="margin-left: 5px"/>
+            <img src="../images/moveRight.gif" border="0" style="margin-left: 5px"/>
           </a>
           <xsl:value-of select="title"/>
           <a href="{@deleteAction}" onclick="return confirm('Are you sure you want to delete this pane')">
-            <img src="delete.gif" border="0" style="margin-left: 5px"/>
+            <img src="../images/delete.gif" border="0" style="margin-left: 5px"/>
           </a>
         </td>
         <td class="current-tab-end"/>