diff --git a/ccm-cms-assets-relatedlink/application.xml b/ccm-cms-assets-relatedlink/application.xml
index 8c7f89e77..d7750e791 100755
--- a/ccm-cms-assets-relatedlink/application.xml
+++ b/ccm-cms-assets-relatedlink/application.xml
@@ -2,7 +2,7 @@
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
   name="ccm-cms-assets-relatedlink"
   prettyName="Red Hat CMS Content Asset Related Link"
-  version="6.6.0"
+  version="6.6.1"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
diff --git a/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/default/6.6.0-6.6.1/upd_table_cms_related_links.sql b/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/default/6.6.0-6.6.1/upd_table_cms_related_links.sql
new file mode 100644
index 000000000..d0a316217
--- /dev/null
+++ b/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/default/6.6.0-6.6.1/upd_table_cms_related_links.sql
@@ -0,0 +1,20 @@
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: upd_table_ct_addresses.sql pboy $
+
+UPDATE cms_related_links
+      SET link_list_name = 'NONE'
+      WHERE link_list_name IS NULL;
diff --git a/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/oracle-se-6.6.0-6.6.1.sql
new file mode 100644
index 000000000..87ec9b452
--- /dev/null
+++ b/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/oracle-se-6.6.0-6.6.1.sql
@@ -0,0 +1,23 @@
+--
+-- Copyright (C) 2008 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id: oracle-se-6.6.0-6.6.1.sql 293 2011-01-07 15:10:39Z pboy $
+
+PROMPT Red Hat Enterprise assets-relatedLinks 6.6.0 -> 6.6.1 Upgrade Script (Oracle)
+
+@@ default/6.6.0-6.6.1/upd_table_cms_related_links.sql
+
diff --git a/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/postgres-6.6.0-6.6.1.sql
new file mode 100644
index 000000000..5b77723be
--- /dev/null
+++ b/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/postgres-6.6.0-6.6.1.sql
@@ -0,0 +1,26 @@
+--
+-- Copyright (C) 2011 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $DateTime: 2010/11/10 23:15:09 $
+
+\echo Red Hat Enterprise assets-relatedLinks 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL)
+
+begin;
+
+\i default/6.6.0-6.6.1/upd_table_cms_related_links.sql
+
+commit;
diff --git a/ccm-cms-assets-relatedlink/src/ccm-cms-assets-relatedlink.upgrade b/ccm-cms-assets-relatedlink/src/ccm-cms-assets-relatedlink.upgrade
new file mode 100644
index 000000000..a6cbf9927
--- /dev/null
+++ b/ccm-cms-assets-relatedlink/src/ccm-cms-assets-relatedlink.upgrade
@@ -0,0 +1,5 @@
+<upgrade>
+  <version from="6.6.0" to="6.6.1">
+    <script sql="ccm-cms-assets-relatedlink/upgrade/::database::-6.6.0-6.6.1.sql"/>
+  </version>
+</upgrade>
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/content-item-portlet.xsl b/ccm-cms/web/packages/content-section/xsl/portlets/content-item-portlet.xsl
old mode 100755
new mode 100644
similarity index 77%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/content-item-portlet.xsl
rename to ccm-cms/web/packages/content-section/xsl/portlets/content-item-portlet.xsl
index 07e6cf8ef..d713f06a8
--- a/ccm-portalworkspace/web/packages/portalworkspace/xsl/content-item-portlet.xsl
+++ b/ccm-cms/web/packages/content-section/xsl/portlets/content-item-portlet.xsl
@@ -3,7 +3,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
   xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0">
 
-  <xsl:import href="../../content-section/xsl/cms-item.xsl"/>
+  <xsl:import href="../../../../../packages/content-section/xsl/cms-item.xsl"/>
   
   <xsl:template match="portlet:contentItem">
     <xsl:apply-templates/>
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/content-sections-portlet.xsl b/ccm-cms/web/packages/content-section/xsl/portlets/content-sections-portlet.xsl
old mode 100755
new mode 100644
similarity index 89%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/content-sections-portlet.xsl
rename to ccm-cms/web/packages/content-section/xsl/portlets/content-sections-portlet.xsl
index dda9540d8..ac7343f1c
--- a/ccm-portalworkspace/web/packages/portalworkspace/xsl/content-sections-portlet.xsl
+++ b/ccm-cms/web/packages/content-section/xsl/portlets/content-sections-portlet.xsl
@@ -13,7 +13,8 @@
   </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/images/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-portalworkspace/web/packages/portalworkspace/xsl/tasklist-portlet.xsl b/ccm-cms/web/packages/content-section/xsl/portlets/tasklist-portlet.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/tasklist-portlet.xsl
rename to ccm-cms/web/packages/content-section/xsl/portlets/tasklist-portlet.xsl
diff --git a/ccm-gen-aplaws/application.xml b/ccm-gen-aplaws/application.xml
index 602250bae..1b182a7ce 100755
--- a/ccm-gen-aplaws/application.xml
+++ b/ccm-gen-aplaws/application.xml
@@ -9,7 +9,7 @@
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-subsite" version="6.6.0" relation="ge"/>
-    <ccm:requires name="ccm-ldn-portal" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-portalworkspace" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
     <!--  not required anymore (2007-06-09)
     <ccm:requires name="ccm-ldn-dublin" version="6.6.0" relation="ge"/>
diff --git a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg
index 7df71435d..a364f3d77 100755
--- a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg
+++ b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg
@@ -5,9 +5,10 @@ ccm-cms
 
 # Content assets
 ccm-cms-assets-fileattachment
-# ccm-cms-assets-imagestep
+ccm-cms-assets-imagestep
 ccm-cms-assets-notes
 ccm-cms-assets-relatedlink
+
 # is ccm-ldn-dublin really an asset?
 ## -- ccm-ldn-dublin
 
@@ -49,9 +50,11 @@ ccm-cms-types-newsitem
 # -- ccm-formbuilder-pdf
 ccm-forum
 #  ccm-forum-categorised
+# ccm-portalserver
+ccm-portalworkspace
 # -- ccm-simplesurvey
-# ccm-themedirector
-ccm-user-preferences
+ccm-themedirector
+# ccm-user-preferences
 # -- ccm-weblog
 # -- ccm-webpage
 
@@ -63,8 +66,7 @@ ccm-user-preferences
 # -- ccm-ldn-exporter
 # -- ccm-ldn-freeform
 # -- ccm-ldn-importer
-# ccm-ldn-navigation
-ccm-ldn-portal
+ccm-ldn-navigation
 # ccm-ldn-rss
 ccm-ldn-search
 ccm-ldn-shortcuts
diff --git a/ccm-gen-aplaws/src/ccm-gen-aplaws.load b/ccm-gen-aplaws/src/ccm-gen-aplaws.load
index 8fd14b0c0..e00e21b67 100755
--- a/ccm-gen-aplaws/src/ccm-gen-aplaws.load
+++ b/ccm-gen-aplaws/src/ccm-gen-aplaws.load
@@ -7,7 +7,8 @@
     <initializer class="com.arsdigita.cms.Initializer"/>
     <initializer class="com.arsdigita.london.terms.Initializer"/>
     <initializer class="com.arsdigita.london.subsite.Initializer"/>
-    <initializer class="com.arsdigita.london.portal.Initializer"/>
+    <initializer class="com.arsdigita.portalworkspace.Initializer"/>
+    <initializer class="com.arsdigita.london.navigation.Initializer"/>
     <initializer class="com.arsdigita.london.search.Initializer"/>
   </requires>
   <provides>
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/workspace-directory-portlet.xsl b/ccm-ldn-rss/web/__ccm__/apps/rss/xsl/workspace-directory-portlet.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/workspace-directory-portlet.xsl
rename to ccm-ldn-rss/web/__ccm__/apps/rss/xsl/workspace-directory-portlet.xsl
diff --git a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java
index 1b913727a..ad4132062 100755
--- a/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java
+++ b/ccm-portalworkspace/src/com/arsdigita/portalworkspace/Loader.java
@@ -132,7 +132,7 @@ public class Loader extends PackageLoader {
         if (url != null) {
 
             // check weather the url parameter is properly formatted
-            s_log.error("process url " + url);
+            s_log.debug("process url " + url);
             Assert.isTrue(url.startsWith("/"), "url starts not with /");
             Assert.isTrue(url.endsWith("/"), "url ends not with /");
             Assert.isTrue(!url.equals("/"), "url is not /");
@@ -149,7 +149,7 @@ public class Loader extends PackageLoader {
             } else {
                 name = url.substring(1, url.length() - 1);
             }
-            s_log.error("node name is " + name);
+            s_log.debug("node name is " + name);
 
             // set up the portal node
         //  Workspace workspace = Workspace.createWorkspace(name, title,
diff --git a/ccm-portalworkspace/web/__ccm__/apps/portal-workspace/xsl/admin.xsl b/ccm-portalworkspace/web/__ccm__/apps/portal-workspace/xsl/admin.xsl
deleted file mode 100755
index 09b32f049..000000000
--- a/ccm-portalworkspace/web/__ccm__/apps/portal-workspace/xsl/admin.xsl
+++ /dev/null
@@ -1,9 +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/portalworkspace/xsl/admin.xsl"/>
-
-</xsl:stylesheet>
diff --git a/ccm-portalworkspace/web/themes/heirloom/apps/portal-workspace/xsl/admin.xsl b/ccm-portalworkspace/web/themes/heirloom/apps/portal-workspace/xsl/admin.xsl
new file mode 100755
index 000000000..2803707e0
--- /dev/null
+++ b/ccm-portalworkspace/web/themes/heirloom/apps/portal-workspace/xsl/admin.xsl
@@ -0,0 +1,9 @@
+<?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/portal-workspace/xsl/admin.xsl"/>
+
+</xsl:stylesheet>
diff --git a/ccm-portalworkspace/web/__ccm__/apps/portal-workspace/xsl/edit.xsl b/ccm-portalworkspace/web/themes/heirloom/apps/portal-workspace/xsl/edit.xsl
similarity index 81%
rename from ccm-portalworkspace/web/__ccm__/apps/portal-workspace/xsl/edit.xsl
rename to ccm-portalworkspace/web/themes/heirloom/apps/portal-workspace/xsl/edit.xsl
index ddcb9c72f..581b180ea 100755
--- a/ccm-portalworkspace/web/__ccm__/apps/portal-workspace/xsl/edit.xsl
+++ b/ccm-portalworkspace/web/themes/heirloom/apps/portal-workspace/xsl/edit.xsl
@@ -3,7 +3,7 @@
   xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
   version="1.0">
 
-  <xsl:import href="../../../../packages/portalworkspace/xsl/portal.xsl"/>
+  <xsl:import href="../../../packages/portal-workspace/xsl/portal.xsl"/>
 
   <xsl:template match="portal:workspaceDetails">
     <a href="index.jsp">View</a>
diff --git a/ccm-portalworkspace/web/__ccm__/apps/portal-workspace/xsl/index.xsl b/ccm-portalworkspace/web/themes/heirloom/apps/portal-workspace/xsl/index.xsl
similarity index 82%
rename from ccm-portalworkspace/web/__ccm__/apps/portal-workspace/xsl/index.xsl
rename to ccm-portalworkspace/web/themes/heirloom/apps/portal-workspace/xsl/index.xsl
index 7fd4eacc9..f46531221 100755
--- a/ccm-portalworkspace/web/__ccm__/apps/portal-workspace/xsl/index.xsl
+++ b/ccm-portalworkspace/web/themes/heirloom/apps/portal-workspace/xsl/index.xsl
@@ -3,7 +3,7 @@
   xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
   version="1.0">
 
-  <xsl:import href="../../../../packages/portalworkspace/xsl/portal.xsl"/>
+  <xsl:import href="../../../packages/portal-workspace/xsl/portal.xsl"/>
 
   <xsl:template match="portal:workspaceDetails">
     <xsl:if test="@canEdit = 'true'">
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/www/assets/CheckEmpty16.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/CheckEmpty16.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/www/assets/CheckEmpty16.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/CheckEmpty16.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/www/assets/CheckFull16.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/CheckFull16.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/www/assets/CheckFull16.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/CheckFull16.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/www/assets/Group16.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/Group16.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/www/assets/Group16.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/Group16.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/www/assets/RadioEmpty16.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/RadioEmpty16.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/www/assets/RadioEmpty16.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/RadioEmpty16.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/www/assets/RadioFull16.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/RadioFull16.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/www/assets/RadioFull16.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/RadioFull16.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/www/assets/User16.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/User16.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/www/assets/User16.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/User16.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/www/assets/delete.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/delete.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/www/assets/delete.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/delete.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/www/assets/down.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/down.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/www/assets/down.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/down.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/www/assets/left.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/left.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/www/assets/left.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/left.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/www/assets/right.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/right.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/www/assets/right.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/right.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/www/assets/up.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/up.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/www/assets/up.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/www/assets/up.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/admin.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/admin.xsl
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/admin.xsl
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/admin.xsl
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/application-directory-portlet.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/application-directory-portlet.xsl
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/application-directory-portlet.xsl
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/application-directory-portlet.xsl
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/content-directory-portlet.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/content-directory-portlet.xsl
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/content-directory-portlet.xsl
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/content-directory-portlet.xsl
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/customize.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/customize.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/customize.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/customize.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/delete.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/delete.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/delete.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/delete.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/display.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/display.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/display.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/display.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/flash-portlet.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/flash-portlet.xsl
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/flash-portlet.xsl
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/flash-portlet.xsl
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/freeform-html-portlet.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/freeform-html-portlet.xsl
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/freeform-html-portlet.xsl
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/freeform-html-portlet.xsl
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/lib.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/lib.xsl
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/lib.xsl
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/lib.xsl
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/login-portlet.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/login-portlet.xsl
similarity index 95%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/login-portlet.xsl
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/login-portlet.xsl
index 51f0a61ef..a725c3ed6 100755
--- a/ccm-portalworkspace/web/packages/portalworkspace/xsl/login-portlet.xsl
+++ b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/login-portlet.xsl
@@ -33,7 +33,8 @@
       </tr>
       <tr>
         <td colspan="2">
-          <input type="checkbox" checked="checked" name="persistentCookieP" value="1" id="persistentCookieP:1"/>
+          <input type="checkbox" checked="checked" name="persistentCookieP"
+                value="1" id="persistentCookieP:1"/>
           <label for="persistentCookieP:1">Remember this login?</label>
         </td>
       </tr>
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/moveDown.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveDown.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/moveDown.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveDown.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/moveLeft.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveLeft.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/moveLeft.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveLeft.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/moveRight.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveRight.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/moveRight.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveRight.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/moveUp.gif b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveUp.gif
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/moveUp.gif
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/moveUp.gif
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/portal.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/portal.xsl
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/portal.xsl
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/portal.xsl
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/portlets.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/portlets.xsl
similarity index 69%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/portlets.xsl
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/portlets.xsl
index f1303e12a..86a62ffe3 100755
--- a/ccm-portalworkspace/web/packages/portalworkspace/xsl/portlets.xsl
+++ b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/portlets.xsl
@@ -2,22 +2,30 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
-  <xsl:import href="content-sections-portlet.xsl"/>
-  <xsl:import href="login-portlet.xsl"/>
-  <xsl:import href="time-of-day-portlet.xsl"/>
-  <xsl:import href="content-item-portlet.xsl"/>
-  <xsl:import href="freeform-html-portlet.xsl"/>
-  <xsl:import href="rss-feed-portlet.xsl"/>
-  <xsl:import href="tasklist-portlet.xsl"/>
   <xsl:import href="application-directory-portlet.xsl"/>
-  <xsl:import href="workspace-directory-portlet.xsl"/>
   <xsl:import href="content-directory-portlet.xsl"/>
-  <xsl:import href="flash-portlet.xsl"/>
+  <xsl:import href="flash-portlet.xsl"/>
+  <xsl:import href="freeform-html-portlet.xsl"/>
+  <xsl:import href="login-portlet.xsl"/>
+  <!-- MyWorkspacesPortlet - xsl file missing   -->
+  <xsl:import href="rss-feed-portlet.xsl"/>
+  <xsl:import href="time-of-day-portlet.xsl"/>
+  <!-- WorkspaceNavigatorPortlet - xsl file missing   -->
+  <!-- WorkspaceSummaryPortlet - xsl file missing   -->
+
+<!-- stuff from/for portlets not part of the portal package
+     (ccm-cms, ldn-rss)
+  <xsl:import href="content-sections-portlet.xsl"/>
+  <xsl:import href="content-item-portlet.xsl"/>
+  <xsl:import href="tasklist-portlet.xsl"/>
+  <xsl:import href="workspace-directory-portlet.xsl"/>
+-->
+  <!-- We want no dependency from forum package in the portal package -->
   <!-- import statement, if forum is installed in a separate webapp context
-  <xsl:import href="../../../../ccm-forum/packages/forum/xsl/recent-postings-portlet.xsl"/>
+  <xsl:import href="../../../../ccm-forum/packages/forum/xsl/recent-postings-portlet.xsl"/>
   -->
   <!-- import statement, if forum is installed in the main CCM webapp context
+  <xsl:import href="../../../../packages/forum/xsl/recent-postings-portlet.xsl"/>
   -->
-  <xsl:import href="../../../packages/forum/xsl/recent-postings-portlet.xsl"/>
   <xsl:import href="/__ccm__/servlet/portlet-type/index.xsl"/>
 </xsl:stylesheet>
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/rss-feed-portlet.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/rss-feed-portlet.xsl
similarity index 88%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/rss-feed-portlet.xsl
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/rss-feed-portlet.xsl
index 3d9f69fc8..ffdb18d6f 100755
--- a/ccm-portalworkspace/web/packages/portalworkspace/xsl/rss-feed-portlet.xsl
+++ b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/rss-feed-portlet.xsl
@@ -46,7 +46,8 @@
   
   <xsl:template match="rss:channel">
     <xsl:param name="maxItems" select="10"/>
-    <a><xsl:attribute name="href"><xsl:value-of select="rss:link"/></xsl:attribute><xsl:value-of select="rss:title"/></a>
+    <a><xsl:attribute name="href"><xsl:value-of select="rss:link"/>
+       </xsl:attribute><xsl:value-of select="rss:title"/></a>
     <!-- backwards compatability with old rss format -->
     <xsl:for-each select="rss:item[$maxItems > position()]">
       <dl>
@@ -57,7 +58,8 @@
     
   <xsl:template match="rss:item">
     <dt>
-        <a><xsl:attribute name="href"><xsl:value-of select="rss:link"/></xsl:attribute><xsl:value-of select="rss:title"/></a>
+        <a><xsl:attribute name="href"><xsl:value-of select="rss:link"/>
+        </xsl:attribute><xsl:value-of select="rss:title"/></a>
     </dt>
     <dd>
       <xsl:value-of select="rss:description"/>
@@ -67,7 +69,8 @@
   
   <xsl:template match="channel">
     <xsl:param name="maxItems" select="10"/>
-    <a><xsl:attribute name="href"><xsl:value-of select="link"/></xsl:attribute><xsl:value-of select="title"/></a>
+    <a><xsl:attribute name="href"><xsl:value-of select="link"/>
+       </xsl:attribute><xsl:value-of select="title"/></a>
     <!-- backwards compatability with old rss format -->
     <xsl:for-each select="item[$maxItems > position()]">
       <dl>
@@ -78,7 +81,8 @@
     
   <xsl:template match="item">
     <dt>
-        <a><xsl:attribute name="href"><xsl:value-of select="link"/></xsl:attribute><xsl:value-of select="title"/></a>
+        <a><xsl:attribute name="href"><xsl:value-of select="link"/></xsl:attribute>
+           <xsl:value-of select="title"/></a>
     </dt>
     <dd>
       <xsl:value-of select="description"/>
diff --git a/ccm-portalworkspace/web/packages/portalworkspace/xsl/time-of-day-portlet.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/time-of-day-portlet.xsl
similarity index 100%
rename from ccm-portalworkspace/web/packages/portalworkspace/xsl/time-of-day-portlet.xsl
rename to ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/time-of-day-portlet.xsl
diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/Initializer.java b/ccm-themedirector/src/com/arsdigita/themedirector/Initializer.java
index a9600159f..e0ec69c4e 100755
--- a/ccm-themedirector/src/com/arsdigita/themedirector/Initializer.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/Initializer.java
@@ -39,8 +39,10 @@ import com.arsdigita.runtime.DomainInitEvent;
 import com.arsdigita.runtime.PDLInitializer;
 import com.arsdigita.runtime.RuntimeConfig;
 import com.arsdigita.templating.PatternStylesheetResolver;
+
 import org.apache.log4j.Logger;
 
+
 /**
  * The Theme Directory initializer.
  *
@@ -91,6 +93,7 @@ public class Initializer extends CompoundInitializer {
         evt.getFactory().registerInstantiator(
             ThemeDirector.BASE_DATA_OBJECT_TYPE,
             new ACSObjectInstantiator() {
+                @Override
                 public DomainObject doNewInstance(DataObject dataObject) {
                     return new ThemeDirector(dataObject);
                 }