diff --git a/ccm-core/web/themes/foundry-base/conf/templates.xml b/ccm-core/web/themes/foundry-base/conf/templates.xml
index 51742526e..a7035545f 100644
--- a/ccm-core/web/themes/foundry-base/conf/templates.xml
+++ b/ccm-core/web/themes/foundry-base/conf/templates.xml
@@ -33,6 +33,9 @@
             <content-item content-type="com.arsdigita.cms.contenttypes.NewsItem">
                 content-items/news-detail.xml
             </content-item>
+            <content-item content-type="com.arsdigita.cms.contenttypes.SiteProxy">
+                content-items/siteproxy-detail.xml
+            </content-item>
             <default>content-items/detail-default.xml</default>
         </detail>
         <link>
diff --git a/ccm-core/web/themes/foundry-base/templates/content-items/detail-default.xml b/ccm-core/web/themes/foundry-base/templates/content-items/detail-default.xml
index 3d4f29220..1b59004d2 100644
--- a/ccm-core/web/themes/foundry-base/templates/content-items/detail-default.xml
+++ b/ccm-core/web/themes/foundry-base/templates/content-items/detail-default.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <content-item-layout>
-    <h2>
+    <!--<h2>
         <content-item-title/>
-    </h2>
+    </h2>-->
     <div>
         <show-property name="pageDescription"/>
     </div>
diff --git a/ccm-core/web/themes/foundry-base/templates/content-items/siteproxy-detail.xml b/ccm-core/web/themes/foundry-base/templates/content-items/siteproxy-detail.xml
new file mode 100644
index 000000000..98643d65f
--- /dev/null
+++ b/ccm-core/web/themes/foundry-base/templates/content-items/siteproxy-detail.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<content-item-layout>
+    <div>
+        <siteproxy-content/>
+    </div>
+</content-item-layout>
\ No newline at end of file
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
index aba772b61..79d82c502 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
@@ -35,6 +35,7 @@
     <xsl:import href="content-items/event.xsl"/>
     <xsl:import href="content-items/mpa.xsl"/>
     <xsl:import href="content-items/news.xsl"/>
+    <xsl:import href="content-items/siteproxy.xsl"/>
     <xsl:import href="content-items/assets/image-attachments.xsl"/>
     <xsl:import href="content-items/assets/notes.xsl"/>
     <xsl:import href="content-items/assets/related-links.xsl"/>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/siteproxy.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/siteproxy.xsl
new file mode 100644
index 000000000..b46176048
--- /dev/null
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/siteproxy.xsl
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2014 Jens Pelzetter for the LibreCCM Foundation
+    
+    This file is part of the Foundry Theme Engine for LibreCCM
+    
+    Foundry is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+
+    Foundry 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Foundry  If not, see <http://www.gnu.org/licenses/>.
+
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+                xmlns:cms="http://www.arsdigita.com/cms/1.0"
+                xmlns:foundry="http://foundry.libreccm.org"
+                xmlns:nav="http://ccm.redhat.com/navigation"
+                xmlns:ui="http://www.arsdigita.com/ui/1.0"
+                exclude-result-prefixes="xsl xs bebop cms foundry nav ui"
+                version="2.0">
+
+    <foundry:doc section="user" type="template-tag">
+        <foundry:doc-desc>
+            <p>
+                Processes the proxied XML of a SiteProxy using <code>xsl:apply-templates</code>. 
+                Your theme must provide XSL to transform the proxied XML into HTML.
+            </p>
+        </foundry:doc-desc>
+    </foundry:doc>
+     <xsl:template match="/content-item-layout//siteproxy-content">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:apply-templates select="$contentitem-tree/cms:siteProxyPanel/*"/>
+     </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/DecisionTree/DecisionTree.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/DecisionTree/DecisionTree.xsl
index 7efb439ee..127e3071d 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/DecisionTree/DecisionTree.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/DecisionTree/DecisionTree.xsl
@@ -114,9 +114,9 @@
                 <xsl:value-of select="./sections/instructions"/>
             </div>
             <script type="text/javascript"
-                    src="{$context-prefix}/templates/ccm-cms-types-decisiontree/forms.js"/>
+                    src="{$content-prefix}/templates/ccm-cms-types-decisiontree/forms.js"/>
             <form method="get"
-                  action="{$context-prefix}/templates/ccm-cms-types-decisiontree/form-handler.jsp">
+                  action="{}/templates/ccm-cms-types-decisiontree/form-handler.jsp">
                 <div>
                     <input name="section_oid"
                        type="hidden">