diff --git a/ccm-cms/web/themes/heirloom/packages/cms/xsl/cms-item.xsl b/ccm-cms/web/themes/heirloom/packages/cms/xsl/cms-item.xsl
index 94d804470..acb1160b3 100755
--- a/ccm-cms/web/themes/heirloom/packages/cms/xsl/cms-item.xsl
+++ b/ccm-cms/web/themes/heirloom/packages/cms/xsl/cms-item.xsl
@@ -11,7 +11,7 @@
   <xsl:import href="types/FileAttachments.xsl"/>
   <xsl:import href="types/Link.xsl"/>
 
-  <xsl:import href="/themes/servlet/content-type/index.xsl"/>
+  <xsl:import href="../../../../servlet/content-type/index.xsl"/>
 
   <!-- The styling rules for the live view of an UserDefinedContentItem -->
   <xsl:template match="cms:item[@javaClass='com.arsdigita.cms.UserDefinedContentItem']">
diff --git a/ccm-core/web/themes/heirloom/apps/acs-subsite.deletemeSoon/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/acs-subsite.deletemeSoon/xsl/index.xsl
deleted file mode 100644
index e187871db..000000000
--- a/ccm-core/web/themes/heirloom/apps/acs-subsite.deletemeSoon/xsl/index.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/login/xsl/login_en.xsl"/> 
-  
-</xsl:stylesheet>
diff --git a/ccm-forum/web/themes/heirloom/packages/forum/xsl/forum.xsl b/ccm-forum/web/themes/heirloom/packages/forum/xsl/forum.xsl
index 97e68ad3f..7b3830cb7 100755
--- a/ccm-forum/web/themes/heirloom/packages/forum/xsl/forum.xsl
+++ b/ccm-forum/web/themes/heirloom/packages/forum/xsl/forum.xsl
@@ -4,12 +4,7 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0">
 
-  <!-- IMPORT DEFINITIONS ccm-forum installed as separate web application
-  <xsl:import href="../../../../ROOT/themes/heirloom/packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../../ROOT/themes/heirloom/packages/ui/xsl/ui.xsl"/>
-  -->
-  <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
-  -->
+  <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp  -->
   <xsl:import href="../../bebop/xsl/bebop.xsl"/>
   <xsl:import href="../../ui/xsl/ui.xsl"/>
 
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
index e0ba7ce18..28b64496a 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/project.xml
@@ -15,7 +15,7 @@
                  version="2.3.0" 
                  release="devel" 
                   webxml="web.xml" 
-                  webapp="ROOT"
+                  webapp="aplaws"
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
 
 <ccm:databases>
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/admin-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/admin-index.xsl
index 86bc861d2..33563d708 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/admin-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/admin-index.xsl
@@ -3,16 +3,15 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
-<!--
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/admin/xsl/index.xsl"/>
-  -->
-  <xsl:import href="../../heirloom/apps/admin/xsl/index.xsl"/>
-  <xsl:import href="lib/page.xsl"/>
 
-  <xsl:param name="theme-prefix"/>
+    <xsl:import href="../../heirloom/apps/admin/xsl/index.xsl"/>
+    <xsl:import href="lib/page.xsl"/>
 
-  <xsl:template name="aplaws:headerStyleSheets">
-    <link rel="stylesheet" href="{$theme-prefix}/admin-index.css" type="text/css" media="screen"/>
-  </xsl:template>
+    <xsl:param name="theme-prefix"/>
+
+    <xsl:template name="aplaws:headerStyleSheets">
+      <link rel="stylesheet" 
+            href="{$theme-prefix}/admin-index.css" type="text/css" media="screen"/>
+    </xsl:template>
 
 </xsl:stylesheet>
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-index.xsl
index b206337e4..c5e07d142 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/atoz-index.xsl
@@ -10,17 +10,12 @@
    exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz"
                    version="1.0">
 
-  <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/content-section/xsl/index.xsl"/>
-  -->
-
-  <!-- IMPORT DEFINITIONS ccm-atoz  installed into the main CCM webapp
-  -->
+  <!-- IMPORT DEFINITIONS ccm-atoz  installed into the main CCM webapp  -->
   <xsl:import href="../../../themes/heirloom/apps/content-section/xsl/index.xsl"/>
 	
 <xsl:import href="lib/header.xsl"/>
 <xsl:import href="lib/lib.xsl"/>
-<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
+<xsl:import href="../../heirloom/packages/bebop/xsl/dcp.xsl"/>
    
 <xsl:param name="context-prefix"></xsl:param>
 <xsl:param name="dispatcher-prefix" />
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-categories.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-categories.xsl
index 89557e8cb..a325d783a 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-categories.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-categories.xsl
@@ -8,12 +8,7 @@
 				exclude-result-prefixes="xsl bebop nav search portal forum cms" 
 				version="1.0">
 
-  <!-- IMPORT DEFINITIONS ccm-forum installed as separate web application
-	<xsl:import href="../../../../ROOT/themes/static/aplaws/category-step.xsl"/>
-  	<xsl:import href="../../../../ROOT/themes/heirloom/packages/cms/admin/category-step/category-step.xsl"/>	
-  -->
-  <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
-  -->
+  <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp -->
   <xsl:import href="../../category-step.xsl"/>
   <xsl:import href="../../../heirloom/packages/cms/xsl/admin/category-step/category-step.xsl"/>	
 
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-index.xsl
index 94f34946a..1b96c72af 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-index.xsl
@@ -9,26 +9,15 @@
 				exclude-result-prefixes="xsl bebop nav search portal forum cms" 
 				version="1.0">
 
-  <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
-	<xsl:import href="../../../../ROOT/themes/heirloom/packages/bebop/xsl/bebop.xsl" />
-	<xsl:import href="../../../../ROOT/themes/heirloom/packages/ui/xsl/ui.xsl" />
-	<xsl:import href="../../../../ROOT/themes/heirloom/packages/bebop/xsl/bebop.xsl" />
-  -->
-  <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
-  -->
+  <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp   -->
   <xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />
   <xsl:import href="../../../packages/ui/xsl/ui.xsl" />
   <xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />
 
-	<xsl:import href="lib/header.xsl" />
-	<xsl:import href="lib/lib.xsl" />
-	<xsl:import href="lib/leftNav.xsl" />
-	<xsl:import href="forum-categories.xsl"/>
-  <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
-	<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
-  -->
-  <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
-  -->
+  <xsl:import href="lib/header.xsl" />
+  <xsl:import href="lib/lib.xsl" />
+  <xsl:import href="lib/leftNav.xsl" />
+  <xsl:import href="forum-categories.xsl"/>
   <xsl:import href="../../../packages/bebop/xsl/dcp.xsl"/>
 
 	<xsl:param name="theme-prefix" />
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/forum-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/forum-index.xsl
index b87c2c0ce..1503bbcf5 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/forum-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/forum-index.xsl
@@ -15,11 +15,6 @@
 	<xsl:import href="lib/header.xsl" />
 	<xsl:import href="lib/lib.xsl" />
 	<xsl:import href="lib/leftNav.xsl" />
-        <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
-	<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
-	-->
- 	<!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
-	-->
 	<xsl:import href="../../../packages/bebop/xsl/dcp.xsl"/>
   
 
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-index.xsl
index f7293d5f9..7cb689f99 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-index.xsl
@@ -9,13 +9,7 @@
      exclude-result-prefixes="xsl bebop nav search portal forum cms" 
                      version="1.0">
 
-        <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
-	<xsl:import href="../../../../ROOT/themes/heirloom/packages/bebop/xsl/bebop.xsl" />
-	<xsl:import href="../../../../ROOT/themes/heirloom/packages/ui/xsl/ui.xsl" />
-	<xsl:import href="../../../../ROOT/themes/heirloom/packages/bebop/xsl/bebop.xsl" />
-	-->
- 	<!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
-	-->
+ 	<!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp-->
 	<xsl:import href="../../heirloom/packages/bebop/xsl/bebop.xsl" />
 	<xsl:import href="../../heirloom/packages/ui/xsl/ui.xsl" />
 <!-- 	<xsl:import href="../../heirloom/packages/bebop/xsl/bebop.xsl" /> -->
@@ -23,11 +17,6 @@
 	<xsl:import href="lib/header.xsl" />
 	<xsl:import href="lib/lib.xsl" />
 	<xsl:import href="lib/leftNav.xsl" />
-        <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
-	<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
-	-->
- 	<!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
-	-->
 	<xsl:import href="../../heirloom/packages/bebop/xsl/dcp.xsl"/>
   
 
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/navigation-admin.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/navigation-admin.xsl
index ce8f82af0..1f1381c23 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/navigation-admin.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/navigation-admin.xsl
@@ -4,7 +4,7 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
 
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/navigation/xsl/admin.xsl"/>
+  <xsl:import href="../../heirloom/apps/navigation/xsl/admin.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix" />
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/search-index.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/search-index.xsl
index e99b1915f..8bafa29c2 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/search-index.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/search-index.xsl
@@ -14,14 +14,9 @@
   <xsl:import href="lib/header.xsl"/>
   <xsl:import href="lib/lib.xsl"/>
 
-  <!-- path if installed in its own web context ccm-ldn-shortcuts 
-    <xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
-    <xsl:import href="../../../../ROOT/themes/heirloom/apps/content-section/xsl/index.xsl"/>
-  -->
-  <!-- path to xsl if installed in the main (common) web context   
-  -->
-  <xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../themes/heirloom/apps/content-section/xsl/index.xsl"/>
+  <!-- path to xsl if installed in the main (common) web context            -->
+  <xsl:import href="../../heirloom/packages/bebop/xsl/bebop.xsl"/>
+  <xsl:import href="../../heirloom/apps/content-section/xsl/index.xsl"/>
 
   <xsl:param name="context-prefix"/>
   <xsl:param name="dispatcher-prefix" />
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/types/ContentTypes.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/types/ContentTypes.xsl
index 8b3c97dfe..63d219a37 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/types/ContentTypes.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/types/ContentTypes.xsl
@@ -10,7 +10,7 @@
 
 
 
-<xsl:import href="/themes/servlet/content-type/index.xsl"/>
+<xsl:import href="../../../servlet/content-type/index.xsl"/>
 <xsl:import href="Article.xsl"/>
 <xsl:import href="MultiPartArticle.xsl"/>
 <xsl:import href="FileStorageItem.xsl"/>
diff --git a/ccm-ldn-terms/web/themes/heirloom/apps/terms/xsl/index.xsl b/ccm-ldn-terms/web/themes/heirloom/apps/terms/xsl/index.xsl
index 6b0e3532a..e57d0efb3 100755
--- a/ccm-ldn-terms/web/themes/heirloom/apps/terms/xsl/index.xsl
+++ b/ccm-ldn-terms/web/themes/heirloom/apps/terms/xsl/index.xsl
@@ -4,13 +4,8 @@
                xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
                    version="1.0">
   
-  <!-- IMPORT DEFINITIONS ccm-ldn-terms installed as separate web application
-  <xsl:import href="../../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../../../ROOT/packages/ui/xsl/ui.xsl"/>
-   -->
 
-  <!-- IMPORT DEFINITIONS ccm-ldn-terms installed into the main CCM webapp
-  -->
+  <!-- IMPORT DEFINITIONS ccm-ldn-terms installed into the main CCM webapp  -->
   <xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/>
   <xsl:import href="../../../packages/ui/xsl/ui.xsl"/>
 
diff --git a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/portlets.xsl b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/portlets.xsl
index acd1e9735..24889d40b 100755
--- a/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/portlets.xsl
+++ b/ccm-portalworkspace/web/themes/heirloom/packages/portal-workspace/xsl/portlets.xsl
@@ -29,5 +29,5 @@
   <!-- 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="/themes/servlet/portlet-type/index.xsl"/>
+  <xsl:import href="../../../../servlet/portlet-type/index.xsl"/>
 </xsl:stylesheet>
diff --git a/ccm-rssfeed/web/themes/heirloom/apps/rss-feed/xsl/index.xsl b/ccm-rssfeed/web/themes/heirloom/apps/rss-feed/xsl/index.xsl
index c74236775..e7b51a390 100755
--- a/ccm-rssfeed/web/themes/heirloom/apps/rss-feed/xsl/index.xsl
+++ b/ccm-rssfeed/web/themes/heirloom/apps/rss-feed/xsl/index.xsl
@@ -2,13 +2,8 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
-  <!--   import statements if executed in its own ccm-ldn-rss web application context
-    <xsl:import href="../../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
-    <xsl:import href="../../../../../ROOT/packages/ui/xsl/ui.xsl"/>
-  -->
 
-  <!--   import statements if executed in CCM main web application context
-  -->
+  <!--   import statements if executed in CCM main web application context  -->
   <xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/>
   <xsl:import href="../../../packages/ui/xsl/ui.xsl"/>
 
diff --git a/ccm-simplesurvey/web/themes/heirloom/packages/simple-survey/xsl/simplesurvey.xsl b/ccm-simplesurvey/web/themes/heirloom/packages/simple-survey/xsl/simplesurvey.xsl
index 425dfa697..cf922f079 100755
--- a/ccm-simplesurvey/web/themes/heirloom/packages/simple-survey/xsl/simplesurvey.xsl
+++ b/ccm-simplesurvey/web/themes/heirloom/packages/simple-survey/xsl/simplesurvey.xsl
@@ -4,12 +4,8 @@
                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
                    version="1.0">
 
-   <!-- IMPORT DEFINITIONS ccm-simplesurvey installed as separate web application
-   <xsl:import href="../../../../ROOT/packages/content-section/xsl/cms.xsl"/> 
-   -->
 
-   <!-- IMPORT DEFINITIONS ccm-simplesurvey installed into the main CCM webapp
-   -->
+   <!-- IMPORT DEFINITIONS ccm-simplesurvey installed into the main CCM webapp   -->
    <xsl:import href="../../packages/cms/xsl/cms.xsl"/> 
 
    <xsl:import href="view.xsl"/> <!-- Stylesheet for the page for submitting a survey -->
diff --git a/ccm-subsite/web/themes/heirloom/apps/subsite/xsl/index.xsl b/ccm-subsite/web/themes/heirloom/apps/subsite/xsl/index.xsl
index eb67400d8..38dda0a76 100755
--- a/ccm-subsite/web/themes/heirloom/apps/subsite/xsl/index.xsl
+++ b/ccm-subsite/web/themes/heirloom/apps/subsite/xsl/index.xsl
@@ -6,13 +6,8 @@
   xmlns:subsite="http://ccm.redhat.com/subsite/1.0"
   version="1.0">
   
-  <!-- IMPORT DEFINITIONS ccm-subsite installed as separate web application
-  <xsl:import href="../../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../../../ROOT/packages/ui/xsl/ui.xsl"/>
-  -->
 
-  <!-- IMPORT DEFINITIONS ccm-shortcuts installed into the main CCM webapp
-  -->
+  <!-- IMPORT DEFINITIONS ccm-shortcuts installed into the main CCM webapp  -->
   <xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/>
   <xsl:import href="../../../packages/ui/xsl/ui.xsl"/>
   
diff --git a/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/index.xsl b/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/index.xsl
index 0a07ab1a8..69533f193 100755
--- a/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/index.xsl
+++ b/ccm-themedirector/web/themes/heirloom/apps/theme-director/xsl/index.xsl
@@ -4,12 +4,7 @@
                xmlns:theme="http://ccm.redhat.com/themedirector/1.0"
                    version="1.0">
 
-  <!-- IMPORT DEFINITIONS ccm-ldn-theme installed as separate web application
-  <xsl:import href="../../../../../ROOT/themes/heirloom/packages/bebop/xsl/bebop.xsl"/>
-  <xsl:import href="../../../../../ROOT/themes/heirloom/packages/ui/xsl/ui.xsl"/>
-  -->
-  <!-- IMPORT DEFINITIONS ccm-themedirector installed into the main CCM webapp
-  -->
+  <!-- IMPORT DEFINITIONS ccm-themedirector installed into the main CCM webapp  -->
   <xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/>
   <xsl:import href="../../../packages/ui/xsl/ui.xsl"/>
 
diff --git a/ccm-themedirector/web/themes/static/default/acs-subsite-index.xsl b/ccm-themedirector/web/themes/static/default/acs-subsite-index.xsl
deleted file mode 100644
index 7b70949d5..000000000
--- a/ccm-themedirector/web/themes/static/default/acs-subsite-index.xsl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
-<!--
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/acs-subsite/xsl/index.xsl"/>
--->
-  <xsl:import href="../../heirloom/apps/acs-subsite/xsl/index.xsl"/>
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/content-center-index.xsl b/ccm-themedirector/web/themes/static/default/content-center-index.xsl
index 2c4fcd463..16ce5c26d 100644
--- a/ccm-themedirector/web/themes/static/default/content-center-index.xsl
+++ b/ccm-themedirector/web/themes/static/default/content-center-index.xsl
@@ -4,6 +4,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0" >
   
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/content-center/xsl/index.xsl"/> 
+  <xsl:import href="../../heirloom/apps/content-center/xsl/index.xsl"/> 
 
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/content-section-admin.xsl b/ccm-themedirector/web/themes/static/default/content-section-admin.xsl
index 79129c4b9..89cce7430 100644
--- a/ccm-themedirector/web/themes/static/default/content-section-admin.xsl
+++ b/ccm-themedirector/web/themes/static/default/content-section-admin.xsl
@@ -4,6 +4,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0" >
   
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/content-section/xsl/admin.xsl"/>
+  <xsl:import href="../../heirloom/apps/content-section/xsl/admin.xsl"/>
 
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/content-section-index.xsl b/ccm-themedirector/web/themes/static/default/content-section-index.xsl
index 206b58e6b..d3154e098 100644
--- a/ccm-themedirector/web/themes/static/default/content-section-index.xsl
+++ b/ccm-themedirector/web/themes/static/default/content-section-index.xsl
@@ -4,6 +4,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0" >
   
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/content-section/xsl/index.xsl"/>
+  <xsl:import href="../../heirloom/apps/content-section/xsl/index.xsl"/>
 
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/forum-index.xsl b/ccm-themedirector/web/themes/static/default/forum-index.xsl
index cf5c8a7bb..c27a4894b 100644
--- a/ccm-themedirector/web/themes/static/default/forum-index.xsl
+++ b/ccm-themedirector/web/themes/static/default/forum-index.xsl
@@ -4,6 +4,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0" >
   
-  <xsl:import href="../../../../ccm-forum/themes/heirloom/apps/forum/xsl/index.xsl"/> 
+  <xsl:import href="../../heirloom/apps/forum/xsl/index.xsl"/> 
 
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/navigation-admin.xsl b/ccm-themedirector/web/themes/static/default/navigation-admin.xsl
index 17c78bba5..6d28265eb 100644
--- a/ccm-themedirector/web/themes/static/default/navigation-admin.xsl
+++ b/ccm-themedirector/web/themes/static/default/navigation-admin.xsl
@@ -4,6 +4,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0" >
   
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/navigation/xsl/admin.xsl"/> 
+  <xsl:import href="../../heirloom/apps/navigation/xsl/admin.xsl"/> 
 
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/navigation-index.xsl b/ccm-themedirector/web/themes/static/default/navigation-index.xsl
index 1790aa69a..08be52a37 100644
--- a/ccm-themedirector/web/themes/static/default/navigation-index.xsl
+++ b/ccm-themedirector/web/themes/static/default/navigation-index.xsl
@@ -4,5 +4,5 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0" >
   
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/navigation/xsl/index.xsl"/> 
+  <xsl:import href="../../heirloom/apps/navigation/xsl/index.xsl"/> 
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/rss-index.xsl b/ccm-themedirector/web/themes/static/default/rss-index.xsl
index ae3f13ae0..bc1a4a077 100644
--- a/ccm-themedirector/web/themes/static/default/rss-index.xsl
+++ b/ccm-themedirector/web/themes/static/default/rss-index.xsl
@@ -3,6 +3,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0" >
 
-  <xsl:import href="../../../../ccm-ldn-rss/themes/heirloom/apps/rss/xsl/index.xsl"/> 
+  <xsl:import href="../../heirloom/apps/rss/xsl/index.xsl"/> 
 
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/search-index.xsl b/ccm-themedirector/web/themes/static/default/search-index.xsl
index 4788237b2..41e99798d 100644
--- a/ccm-themedirector/web/themes/static/default/search-index.xsl
+++ b/ccm-themedirector/web/themes/static/default/search-index.xsl
@@ -4,6 +4,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0" >
   
-  <xsl:import href="../../../../ccm-ldn-search/themes/heirloom/apps/search/xsl/index.xsl"/>
+  <xsl:import href="../../heirloom/apps/search/xsl/index.xsl"/>
   
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/shortcuts-index.xsl b/ccm-themedirector/web/themes/static/default/shortcuts-index.xsl
index 88bd1fa8b..877272c99 100644
--- a/ccm-themedirector/web/themes/static/default/shortcuts-index.xsl
+++ b/ccm-themedirector/web/themes/static/default/shortcuts-index.xsl
@@ -3,6 +3,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0" >
 
-  <xsl:import href="../../../../ccm-ldn-shortcuts/themes/heirloom/apps/shortcuts/xsl/index.xsl"/> 
+  <xsl:import href="../../heirloom/apps/shortcuts/xsl/index.xsl"/> 
 
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/simplesurvey-index.xsl b/ccm-themedirector/web/themes/static/default/simplesurvey-index.xsl
index e07ba4da9..c142ff32b 100644
--- a/ccm-themedirector/web/themes/static/default/simplesurvey-index.xsl
+++ b/ccm-themedirector/web/themes/static/default/simplesurvey-index.xsl
@@ -3,6 +3,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0" >
     
-  <xsl:import href="../../../../ccm-simplesurvey/themes/heirloom/apps/simplesurvey/xsl/index.xsl"/>
+  <xsl:import href="../../heirloom/apps/simplesurvey/xsl/index.xsl"/>
 
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/sitemap-index.xsl b/ccm-themedirector/web/themes/static/default/sitemap-index.xsl
index 3550757d3..ae067f6e0 100644
--- a/ccm-themedirector/web/themes/static/default/sitemap-index.xsl
+++ b/ccm-themedirector/web/themes/static/default/sitemap-index.xsl
@@ -3,6 +3,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0">
   
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/sitemap/xsl/index.xsl"/> 
+  <xsl:import href="../../heirloom/apps/sitemap/xsl/index.xsl"/> 
 
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/webdev-support-index.xsl b/ccm-themedirector/web/themes/static/default/webdev-support-index.xsl
index 086058a04..a3dc1fbf1 100644
--- a/ccm-themedirector/web/themes/static/default/webdev-support-index.xsl
+++ b/ccm-themedirector/web/themes/static/default/webdev-support-index.xsl
@@ -3,6 +3,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0" >
  
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/webdev-support/xsl/index.xsl"/>
+  <xsl:import href="../../heirloom/apps/webdev-support/xsl/index.xsl"/>
 
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/workspace-admin.xsl b/ccm-themedirector/web/themes/static/default/workspace-admin.xsl
index 614913bc1..ae4665084 100644
--- a/ccm-themedirector/web/themes/static/default/workspace-admin.xsl
+++ b/ccm-themedirector/web/themes/static/default/workspace-admin.xsl
@@ -2,6 +2,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0">
 
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/workspace/xsl/admin.xsl"/> 
+  <xsl:import href="../../heirloom/apps/workspace/xsl/admin.xsl"/> 
 
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/workspace-edit.xsl b/ccm-themedirector/web/themes/static/default/workspace-edit.xsl
index 681c36378..b168809fd 100644
--- a/ccm-themedirector/web/themes/static/default/workspace-edit.xsl
+++ b/ccm-themedirector/web/themes/static/default/workspace-edit.xsl
@@ -2,6 +2,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0">
 
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/workspace/xsl/edit.xsl"/> 
+  <xsl:import href="../../heirloom/apps/workspace/xsl/edit.xsl"/> 
 
 </xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/workspace-index.xsl b/ccm-themedirector/web/themes/static/default/workspace-index.xsl
index afd4bd442..1067f8dc5 100644
--- a/ccm-themedirector/web/themes/static/default/workspace-index.xsl
+++ b/ccm-themedirector/web/themes/static/default/workspace-index.xsl
@@ -2,6 +2,6 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   version="1.0">
 
-  <xsl:import href="../../../../ROOT/themes/heirloom/apps/workspace/xsl/index.xsl"/>
+  <xsl:import href="../../heirloom/apps/workspace/xsl/index.xsl"/>
   
 </xsl:stylesheet>