diff --git a/ccm-core/web/themes/foundry-base/admin-index.xsl b/ccm-core/web/themes/foundry-base/admin-index.xsl
new file mode 100644
index 000000000..5630159ba
--- /dev/null
+++ b/ccm-core/web/themes/foundry-base/admin-index.xsl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+    <xsl:import href="start.xsl"/>
+
+    <xsl:variable name="theme-prefix" select="concat($context-prefix, '/themes/foundry-base')"/>
+
+
+</xsl:stylesheet>
+
diff --git a/ccm-core/web/themes/foundry-base/ccm-admin-application-index.xsl b/ccm-core/web/themes/foundry-base/ccm-admin-application-index.xsl
new file mode 100644
index 000000000..5630159ba
--- /dev/null
+++ b/ccm-core/web/themes/foundry-base/ccm-admin-application-index.xsl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+    <xsl:import href="start.xsl"/>
+
+    <xsl:variable name="theme-prefix" select="concat($context-prefix, '/themes/foundry-base')"/>
+
+
+</xsl:stylesheet>
+
diff --git a/ccm-core/web/themes/foundry-base/content-center-index.xsl b/ccm-core/web/themes/foundry-base/content-center-index.xsl
new file mode 100644
index 000000000..5630159ba
--- /dev/null
+++ b/ccm-core/web/themes/foundry-base/content-center-index.xsl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+    <xsl:import href="start.xsl"/>
+
+    <xsl:variable name="theme-prefix" select="concat($context-prefix, '/themes/foundry-base')"/>
+
+
+</xsl:stylesheet>
+
diff --git a/ccm-core/web/themes/foundry-base/content-section-index.xsl b/ccm-core/web/themes/foundry-base/content-section-index.xsl
new file mode 100644
index 000000000..5630159ba
--- /dev/null
+++ b/ccm-core/web/themes/foundry-base/content-section-index.xsl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+    <xsl:import href="start.xsl"/>
+
+    <xsl:variable name="theme-prefix" select="concat($context-prefix, '/themes/foundry-base')"/>
+
+
+</xsl:stylesheet>
+
diff --git a/ccm-core/web/themes/foundry/foundry/main.xsl b/ccm-core/web/themes/foundry/foundry/main.xsl
index bb30c8091..88f6dea53 100644
--- a/ccm-core/web/themes/foundry/foundry/main.xsl
+++ b/ccm-core/web/themes/foundry/foundry/main.xsl
@@ -54,7 +54,7 @@
                 <xsl:call-template name="foundry:process-template">
                     <xsl:with-param name="template-file" 
                                     select="'default-layout.xml'"/>
-                    <xsl:with-param name="origin" select="internal"/>
+                    <xsl:with-param name="origin" select="'internal'"/>
                 </xsl:call-template>
             </xsl:when>
             <xsl:otherwise>
@@ -72,9 +72,15 @@
     <xsl:function name="foundry:get-current-application">
         <xsl:choose>
             <xsl:when test="$data-tree/@application">
+                <xsl:message>
+                    <xsl:value-of select="concat('Found application ', $data-tree/@application)"/>
+                </xsl:message>
                 <xsl:sequence select="$data-tree/@application"/>
             </xsl:when>
             <xsl:otherwise>
+                <xsl:message>
+                    <xsl:value-of select="'Found no application.'"/>
+                </xsl:message>
                 <xsl:sequence select="'none'"/>
             </xsl:otherwise>
         </xsl:choose>
@@ -83,9 +89,15 @@
     <xsl:function name="foundry:get-current-application-class">
         <xsl:choose>
             <xsl:when test="$data-tree/@class">
+                <xsl:message>
+                    <xsl:value-of select="concat('Found application class ', $data-tree/@class)"/>
+                </xsl:message>
                 <xsl:sequence select="$data-tree/@class"/>
             </xsl:when>
             <xsl:otherwise>
+                <xsl:message>
+                    <xsl:value-of select="'Found no class.'"/>
+                </xsl:message>
                 <xsl:sequence select="'none'"/>
             </xsl:otherwise>
         </xsl:choose>
diff --git a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
index 62b2d5e9e..1e572a74c 100755
--- a/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/devel/cfg/integration.properties
@@ -85,7 +85,7 @@ waf.workflow.simple.alerts_sender=root@localhost.localdomain
 
 # CORE XML processing configuration parameters
 # ##############################################################################
-waf.xml.xsl_transformer=xalan
+waf.xml.xsl_transformer=saxonhe
 waf.xml.activate_full_date_formatter=true
 
 
@@ -229,7 +229,7 @@ waf.admin.password=123456
 waf.admin.password.question=12345
 waf.admin.password.answer=6
 
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm47web
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-aplaws?user\=ccm&password\=ccm47web
 waf.runtime.jdbc_pool_size=60
 
 waf.web.server=localhost\:8080
diff --git a/ccm-ldn-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt b/ccm-ldn-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
index 4dd52bb3d..935112852 100755
--- a/ccm-ldn-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
+++ b/ccm-ldn-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
@@ -23,6 +23,7 @@ http://::host::/::webapp::/themes/::themedir::/::theme::/start.xsl
 # Entry point for new theme only for content center and admin
 # ===========================================================
 
+#http://::host::/::webapp::/themes/mandalay/::application::-::url::.xsl
 http://::host::/::webapp::/themes/foundry-base/::application::-::url::.xsl