diff --git a/ccm-sci-bundle/web/themes/foundry/conf/css-files.xml b/ccm-sci-bundle/web/themes/foundry/conf/css-files.xml
index 279f80d64..62b3251d7 100644
--- a/ccm-sci-bundle/web/themes/foundry/conf/css-files.xml
+++ b/ccm-sci-bundle/web/themes/foundry/conf/css-files.xml
@@ -3,6 +3,9 @@
     <application name="admin">
         <css-file internal="true">admin.css</css-file>
     </application>
+    <application name="cms-admin">
+        <css-file internal="true">admin.css</css-file>
+    </application>
     <application name="navigation">
         <css-file>public.css</css-file>
     </application>
diff --git a/ccm-sci-bundle/web/themes/foundry/conf/global.xml b/ccm-sci-bundle/web/themes/foundry/conf/global.xml
index 41028f926..ae54dd019 100644
--- a/ccm-sci-bundle/web/themes/foundry/conf/global.xml
+++ b/ccm-sci-bundle/web/themes/foundry/conf/global.xml
@@ -6,4 +6,6 @@
         <language locale="en"/>
     </supported-languages>
     
+    <setting id="site-logo">foundry/images/scientificcms_logo.png</setting>
+    
 </foundry:configuration>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/conf/templates.xml b/ccm-sci-bundle/web/themes/foundry/conf/templates.xml
index fcb031b59..35e32c11f 100644
--- a/ccm-sci-bundle/web/themes/foundry/conf/templates.xml
+++ b/ccm-sci-bundle/web/themes/foundry/conf/templates.xml
@@ -5,6 +5,9 @@
             <application name = "" page-class=""></application>
         -->
         <application name="admin" internal="true">admin-layout.xml</application>
+        <application name="navigation" class="portalPage">portal-workspace.xml</application>
+        <application name="none" class="cms-admin" internal="true">admin-layout.xml</application>
+        <application name="portal">portal-workspace.xml</application>
         <default>default-layout.xml</default>
     </applications>
     
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-add.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-add.png
new file mode 100644
index 000000000..0d423a37e
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-add.png differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-delete.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-delete.png
new file mode 100644
index 000000000..fc710bbff
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-delete.png differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-edit.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-edit.png
new file mode 100644
index 000000000..9bbd4dcf5
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-edit.png differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-return.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-return.png
new file mode 100644
index 000000000..1a06e0eed
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action-return.png differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action.png
new file mode 100644
index 000000000..e7aa040a2
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/action.png differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-checked.gif b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-checked.gif
new file mode 100644
index 000000000..abfe86602
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-checked.gif differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-grey-checked.gif b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-grey-checked.gif
new file mode 100644
index 000000000..16fcc90ca
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-grey-checked.gif differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-grey-unchecked.gif b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-grey-unchecked.gif
new file mode 100644
index 000000000..c5175af82
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-grey-unchecked.gif differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-unchecked.gif b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-unchecked.gif
new file mode 100644
index 000000000..2ef997f1c
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/checkbox-unchecked.gif differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/collapse.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/collapse.png
new file mode 100644
index 000000000..f0a5460e4
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/collapse.png differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/expand.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/expand.png
new file mode 100644
index 000000000..6148bb215
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/expand.png differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/gray-triangle-down.gif b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/gray-triangle-down.gif
new file mode 100644
index 000000000..3ee21b373
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/gray-triangle-down.gif differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/gray-triangle-up.gif b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/gray-triangle-up.gif
new file mode 100644
index 000000000..3adf5bc33
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/gray-triangle-up.gif differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/treeNode.png b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/treeNode.png
new file mode 100644
index 000000000..302370b5c
Binary files /dev/null and b/ccm-sci-bundle/web/themes/foundry/foundry/images/bebop/treeNode.png differ
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib.xsl
index 012db0aa9..e6f76b3c3 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib.xsl
@@ -24,6 +24,7 @@
                 version="2.0">
     
     <xsl:import href="lib/bebop.xsl"/>
+    <xsl:import href="lib/portlets.xsl"/>
     <xsl:import href="lib/global-vars.xsl"/>
     <xsl:import href="lib/template-parser.xsl"/>
     <xsl:import href="lib/template-tags.xsl"/>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/double-click-protection.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/double-click-protection.xsl
index 8b5d23f5f..7122f410e 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/double-click-protection.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/double-click-protection.xsl
@@ -43,7 +43,7 @@
         <xsl:if test="$dcp-on-buttons or $dcp-on-links">
             <xsl:variable name="waitMessage" 
                           select="foundry:get-static-text('bebop', 
-                                                          'double-click-protection/wait-message'"/>
+                                                          'double-click-protection/wait-message')"/>
                 
             <script language="javascript">
                 function doubleClickProtect(element) {
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/image.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/image.xsl
index c030e237a..96625349d 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/image.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/image.xsl
@@ -45,7 +45,7 @@
     <!-- EN Processing images -->
     <xsl:template name="bebop:image" match="bebop:image">
         <img class="bebop-image">
-            <xsl:call-template name="mandalay:process-attributes"/>
+            <xsl:call-template name="foundry:process-attributes"/>
         </img>
     </xsl:template>
 
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/label.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/label.xsl
index 3b9790f71..bb1bfc836 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/label.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/label.xsl
@@ -211,11 +211,9 @@
     
         <xsl:call-template name="foundry:bebop-label-text">
             <xsl:with-param name="text"
-                            select="replace(current(), '&apos;', '\&apos;)"/>
-        </xsl:with-param>
-        <xsl:with-param name="escape">
-            <xsl:value-of select="$escape"/>
-        </xsl:with-param>
+                            select="replace(current(), '&#x2019;', '&#x005C;&#x2019;')"/>
+            <!--select="replace(current(), '&apos;', '\&apos;')"/>-->
+            <xsl:with-param name="escape" select="$escape"/>
         </xsl:call-template>
     </xsl:template>
 
@@ -226,9 +224,9 @@
         <xsl:param name="escape">no</xsl:param>
     
         <!-- DE Keine leeren Labels ausgeben. Das original Theme wandelt diese in &#160; um. 
-                Das sollte nicht nötig sein -->
+        Das sollte nicht nötig sein -->
         <!-- EN Don't print empty Labels. Originally they were converted to &#160; 
-                but that shouldn't be needed -->
+        but that shouldn't be needed -->
         <xsl:if test="not(normalize-space($text)='')">
             <xsl:choose>
                 <xsl:when test="$escape='yes'">
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/link.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/link.xsl
index aec9776f5..654e5619d 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/link.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/link.xsl
@@ -76,13 +76,13 @@
         <!-- EN A link with confirmation -->
         <xsl:variable name="confirm">
             <xsl:if test="boolean(@confirm)=true() or starts-with(@onclick, 'return')">
-                <xsl:value-of select="replace(./@onclick, '\', ''"/>
+                <xsl:value-of select="replace(./@onclick, '\', '')"/>
             </xsl:if>
         </xsl:variable>
     
         <a>
             <xsl:call-template name="foundry:process-attributes"/>
-            <xsl:attribute name="href" select="foundry:parse-link(./@href_no_javascript"/>
+            <xsl:attribute name="href" select="foundry:parse-link(./@href_no_javascript)"/>
             <xsl:attribute name="onclick">
                 <xsl:value-of select="$onclick"/>  
                 <xsl:value-of select="$dcp"/>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/list.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/list.xsl
index 0b0e051c3..8b7b116e0 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/list.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/list.xsl
@@ -61,7 +61,7 @@
     <!-- EN a horizontal list with spans -->
     <xsl:template match="bebop:list[@layout = 'horizontal']">
         <div>
-            <xsl:call-template name="mandalay:process-attributes"/>
+            <xsl:call-template name="foundry:process-attributes"/>
             <xsl:apply-templates mode="span"/>
         </div>
     </xsl:template>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/padding.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/padding.xsl
index fb8494b40..206857664 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/padding.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/padding.xsl
@@ -46,7 +46,6 @@
                       select="foundry:get-setting('bebop', 'padding/show-padding', 'false')"/>
         <xsl:variable name="border-color" 
                       select="foundry:get-setting('bebop', 'padding/border-color', 'ccc')"/>
-        </xsl:variable>
 
         <xsl:choose>
             <xsl:when test="$show-padding = 'true'">
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/system-information.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/system-information.xsl
index 6c6d51680..bfad7f64f 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/system-information.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/system-information.xsl
@@ -43,7 +43,6 @@
     <xsl:template match="bebop:systemInformation">
         <a>
             <xsl:attribute name="href" select="foundry:parse-link(./@apphomepage)"/>
-            </xsl:attribute>
             <xsl:value-of select="./@appname"/>
         </a>
         <xsl:text>&nbsp;</xsl:text>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/table.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/table.xsl
index 5e4160a57..a1a5293bf 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/table.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/table.xsl
@@ -140,8 +140,8 @@
             <xsl:with-param name="title" select="'[X]'"/>
             <xsl:with-param name="src" 
                             select="foundry:parse-link(foundry:get-setting('bebop', 
-                                                                           'table/setImage/checkboxChecked', 
-                                                                           '/images/bebop/checkBoxChecked.gif'), 
+                                                                           'table/setImage/checkbox-checked', 
+                                                                           '/images/bebop/checkbox-checked.gif'), 
                                                        $theme-prefix)"/>
         </xsl:call-template>
     </xsl:template>
@@ -152,8 +152,8 @@
             <xsl:with-param name="title" select="'[ ]'"/>
             <xsl:with-param name="src"
                             select="foundry:parse-link(foundry:get-setting('bebop',
-                                                                           'table/setImage/checkboxUnchecked',
-                                                                           '/images/bebop/checkBoxUnchecked.gif'),
+                                                                           'table/setImage/checkbox-unchecked',
+                                                                           '/images/bebop/checkBox-unchecked.gif'),
                                                        $theme-prefix)"/>
         </xsl:call-template>
     </xsl:template>
@@ -164,8 +164,8 @@
             <xsl:with-param name="title" select="'{X}'"/>
             <xsl:with-param name="src" 
                             select="foundry:parse-link(foundry:get-setting('bebop',
-                                                                           'table/setImage/checkboxGreyChecked',
-                                                                           '/images/bebop/checkBoxGreyChecked.gif'),
+                                                                           'table/setImage/checkbox-grey-checked',
+                                                                           '/images/bebop/checkbox-grey-checked.gif'),
                                                        $theme-prefix)"/>
         </xsl:apply-templates>
     </xsl:template>
@@ -176,8 +176,8 @@
             <xsl:with-param name="title" select="'{ }'"/>
             <xsl:with-param name="src"
                             select="foundry:parse-link(foundry:get-setting('bebop',
-                                                                           'table/setImage/checkboxGreyUnchecked',
-                                                                           '/images/bebop/checkBoxGreyUnchecked.gif'),
+                                                                           'table/setImage/checkbox-grey-unchecked',
+                                                                           '/images/bebop/checkbox-grey-unchecked.gif'),
                                                        $theme-prefix)"/>
         </xsl:apply-templates>
     </xsl:template>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/tree.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/tree.xsl
index 8a5dab755..e663cfcc7 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/tree.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/bebop/tree.xsl
@@ -33,7 +33,7 @@
                 xmlns:cms="http://www.arsdigita.com/cms/1.0" 
                 xmlns:foundry="http://foundry.libreccm.org" 
                 xmlns:nav="http://ccm.redhat.com/navigation"
-                exclude-result-prefixes="xsl bebop cms foundry nav mandalay"
+                exclude-result-prefixes="xsl bebop cms foundry nav"
                 version="2.0">
   
     <!-- DE Eine Baumstruktur wird als UL angebildet. -->
@@ -53,11 +53,13 @@
                     <a class="bebop-tree-expanded" title="[-]" href="{@href}">
                         <img style="border:none" alt="[-]">
                             <xsl:attribute name="src"
-                                           select="foundry:parse-link('/images/bebop/collapse.png', 
-                                                                      $theme-prefix)"/>
+                                            select="foundry:gen-path('images/bebop/collapse.png', 
+                                                    true())"/>
+                                           <!--select="foundry:parse-link('/images/bebop/collapse.png', 
+                                                                      $theme-prefix)"/>-->
                         </img>
                     </a>
-                    <xsl:text>&nbsp;</xsl:text>
+                    &nbsp;
                     <xsl:apply-templates select="*[position() = 1]"/>
                     <ul style="list-style-type:none">
                         <xsl:apply-templates select="*[position() > 1]"/>
@@ -67,11 +69,13 @@
                     <a class="bebop:treeCollapsed" title="[+]" href="{@href}">
                         <img style="border:none" alt="[+]">
                             <xsl:attribute name="src" 
-                                           select="foundry:parse-link('/images/bebop/expand.png', 
-                                                                      $theme-prefix)"/>
+                                           select="foundry:gen-path('images/bebop/expand.png', 
+                                                                    true())"/>
+                                           <!--select="foundry:parse-link('/images/bebop/expand.png', 
+                                                                      $theme-prefix)"/>-->
                         </img>
                     </a>
-                    <xsl:text>&nbsp;</xsl:text>
+                    &nbsp;
                     <xsl:apply-templates/>
                 </xsl:when>
                 <xsl:otherwise>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets.xsl
new file mode 100644
index 000000000..8195356c7
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets.xsl
@@ -0,0 +1,28 @@
+<?xml version="1.0"  encoding="utf-8"?>
+<!DOCTYPE stylesheet>
+<!--
+    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"
+                exclude-result-prefixes="xsl"
+                version="2.0">
+                
+    <xsl:import href="portlets/freeform-html.xsl"/>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets/freeform-html.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets/freeform-html.xsl
new file mode 100644
index 000000000..548001fdf
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/portlets/freeform-html.xsl
@@ -0,0 +1,19 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:foundry="http://foundry.libreccm.org"
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+                xmlns:nav="http://ccm.redhat.com/navigation"
+                xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
+                xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
+                xmlns="http://www.w3.org/1999/xhtml"
+                exclude-result-prefixes="xsl xs bebop foundry nav portal portlet"
+                version="2.0">
+    
+
+    <xsl:template match="bebop:portlet[@bebop:classname = 'com.arsdigita.portalworkspace.ui.portlet.FreeformHTMLPortletRenderer']">
+        <div class="portlet portlet-freeform-html">
+            <xsl:value-of disable-output-escaping="yes" select="./*"/>
+        </div>
+    </xsl:template>
+    
+</xsl:stylesheet>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl
index cb4c143de..abfe67402 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags.xsl
@@ -30,6 +30,7 @@
     <xsl:import href="template-tags/html-tags.xsl"/>
     <xsl:import href="template-tags/loaders.xsl"/>
     <xsl:import href="template-tags/navigation.xsl"/>
+    <xsl:import href="template-tags/portal-workspace.xsl"/>
     <xsl:import href="template-tags/subsite.xsl"/>
     
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/cms.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/cms.xsl
index e5cdcbb6b..fef592e11 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/cms.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/cms.xsl
@@ -137,6 +137,33 @@
     
     <!-- _______________________________________________________________________________________ -->
     
+    <xsl:template match="show-cms-content-view-menu">
+        <xsl:param name="layoutTree" select="."/>
+    
+        <xsl:variable name="layout" 
+                      select="foundry:get-setting('cms', 
+                                                  'content-view-menu/layout',
+                                                  'horizontal',
+                                                  ./layout)"/>
+            
+        <xsl:choose>
+            <xsl:when test="$layout = 'horizontal'">
+                <xsl:apply-templates select="$data-tree//*[contains(@class, 'cmsContentViewMenu')]"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <ul>
+                    <xsl:for-each select="$data-tree//*[contains(@class, 'cmsContentViewMenu')]">
+                        <li>
+                            <xsl:apply-templates/>
+                        </li>
+                    </xsl:for-each>
+                </ul>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    <!-- _______________________________________________________________________________________ -->
+    
     <xsl:template match="show-content-type">
         <xsl:if test="$data-tree/bebop:contentType">
             <span id="contenttype">
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl
index d02480ba2..badd8e025 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/admin/common.xsl
@@ -33,7 +33,52 @@
             <xsl:with-param name="layout-tree" select="."/>
         </xsl:apply-templates>
     </xsl:template>
-    
+
+    <xsl:template match="show-bebop-page-title">
+        <xsl:apply-templates select="$data-tree/bebop:title"/>
+    </xsl:template>
+            
+    <xsl:template match="show-body-column">
+        <xsl:choose>
+            <xsl:when test="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body[//bebop:formWidget] 
+                            | $data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right[//bebop:formWidget]">
+                <form>
+                    <xsl:if test="not(@method)">
+                        <xsl:attribute name="method">post</xsl:attribute>
+                    </xsl:if>
+                    <xsl:call-template name="foundry:process-attributes"/>
+                    <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:body 
+                                                 | $data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:right"/>
+                </form>
+            </xsl:when>
+      
+            <xsl:when test="$data-tree//bebop:currentPane/bebop:form[not(//bebop:layoutPanel)]">
+                <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:form"/>
+            </xsl:when>
+      
+            <xsl:when test="$data-tree//bebop:currentPane/cms:container/*[name() != 'cms:container']">
+                <xsl:apply-templates select="$data-tree//bebop:currentPane/cms:container/*[name() != 'cms:container']"/>
+            </xsl:when>
+      
+            <xsl:when test="$data-tree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:body 
+                            | $data-tree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:right">
+                <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:body 
+                                             | $data-tree//bebop:currentPane/bebop:boxPanel//bebop:layoutPanel/bebop:right"/>
+            </xsl:when>
+      
+            <xsl:otherwise>
+                <xsl:apply-templates select="$data-tree//bebop:currentPane/bebop:layoutPanel/bebop:body 
+                                             | $data-tree//bebop:currentPane/bebop:layoutPanel/bebop:right 
+                                             | $data-tree//bebop:currentPane/cms:itemSummary 
+                                             | $data-tree//bebop:currentPane/cms:categorySummary 
+                                             | $data-tree//bebop:currentPane/cms:linkSummary 
+                                             | $data-tree//bebop:currentPane/cms:lifecycleSummary 
+                                             | $data-tree//bebop:currentPane/cms:workflowSummary 
+                                             | $data-tree//bebop:currentPane/cms:transactionSummary"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+            
     <xsl:template match="show-left-column">
         <xsl:choose>
             <xsl:when test="$data-tree//bebop:currentPane/bebop:form//bebop:layoutPanel/bebop:left[//bebop:formWidget]">
@@ -60,10 +105,30 @@
         </xsl:choose>
     </xsl:template>
     
+    <xsl:template match="show-system-information">
+        <div class="system-information">
+            <xsl:apply-templates select="$data-tree/bebop:systemInformation"/>
+        </div>
+    </xsl:template>
+    
     <xsl:template match="show-tabbed-pane">
         <xsl:apply-templates select="$data-tree/bebop:tabbedPane">
             <xsl:with-param name="layout-tree" select="."/>
         </xsl:apply-templates>
     </xsl:template>
+    
+    <xsl:template match="site-logo">
+        <xsl:variable name="src"
+                      select="foundry:get-setting('', 'site-logo', '')"/>
+        
+        <xsl:choose>
+            <xsl:when test="string-length($src) &gt; 0">
+                <img src="{foundry:gen-path($src)}"/> 
+            </xsl:when>
+            <xsl:otherwise>
+                <img src="{foundry:gen-path('images/scientificcms_logo.png', true())}"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
index d4d57829f..c05091fbc 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/html-tags.xsl
@@ -237,7 +237,8 @@
                         </div>
                         <div id="foundry-debug-panel-layout" class="foundry-debug-panel-box">
                             <xsl:variable name="app-layout-template-file" 
-                                          select="foundry:get-app-layout-template($data-tree/@application, $data-tree/@class)"/>
+                                          select="foundry:get-app-layout-template(foundry:get-current-application(), 
+                                                                                  foundry:get-current-application-class())"/>
                                 
                             <h2>Layout Template</h2>
                             <dl>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/navigation.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
index b27aeba69..260317339 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
@@ -6,7 +6,7 @@
                 xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
                 xmlns:nav="http://ccm.redhat.com/navigation"
                 exclude-result-prefixes="xsl bebop foundry nav"
-                version="1.0">
+                version="2.0">
     
     <foundry:doc-file>
         <foundry:doc-file-title>Tags for ccm-navigation</foundry:doc-file-title>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl
new file mode 100644
index 000000000..70936225f
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/template-tags/portal-workspace.xsl
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                xmlns:foundry="http://foundry.libreccm.org"
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+                xmlns:nav="http://ccm.redhat.com/navigation"
+                xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
+                xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
+                xmlns="http://www.w3.org/1999/xhtml"
+                exclude-result-prefixes="xsl xs bebop foundry nav portal portlet"
+                version="2.0">
+    
+    <foundry:doc-file>
+        <foundry:doc-file-title>Tags for portal-workspace</foundry:doc-file-title>
+        <foundry:doc-file-desc>
+            <p>
+                ToDo
+            </p>
+        </foundry:doc-file-desc>
+    </foundry:doc-file>
+    
+    <xsl:template match="portal-workspace">
+        <xsl:apply-templates/>
+    </xsl:template>
+    
+    <xsl:template match="portal-workspace//portal-workspace-edit-links">
+        <xsl:if test="$data-tree/portal:workspace/portal:workspaceDetails/@canEdit = 'true'
+                      or $data-tree/portal:workspace/portal:workspaceDetails/@canAdmin = 'true'">
+            <xsl:choose>
+                <xsl:when test="$data-tree/portal:workspace/@id = 'view'">
+                    <xsl:value-of select="foundry:get-static-text('portal-workspace', 'view/link')"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <a href="{foundry:parse-link($data-tree/portal:workspace/portal:workspaceDetails//primaryURL)}"
+                       title="{foundry:get-static-text('portal-workspace', 'view/title')}">
+                        <xsl:value-of select="foundry:get-static-text('portal-workspace', 'view/link')"/>
+                    </a>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:if test="$data-tree/portal:workspace/portal:workspaceDetails/@canEdit = 'true'">
+                &nbsp;
+                <xsl:choose>
+                    <xsl:when test="$data-tree/portal:workspace/@id = 'edit'">
+                        <xsl:value-of select="foundry:get-static-text('portal-workspace', 'edit/link')"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <a href="{foundry:parse-link(concat($data-tree/portal:workspace/portal:workspaceDetails//primaryURL, 'edit.jsp'))}"
+                           title="{foundry:get-static-text('portal-workspace', 'edit/title')}">
+                            <xsl:value-of select="foundry:get-static-text('portal-workspace', 'edit/link')"/>
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:if>
+            <xsl:if test="$data-tree/portal:workspace/portal:workspaceDetails/@canAdmin = 'true'">
+                &nbsp;
+                <xsl:choose>
+                    <xsl:when test="$data-tree/portal:workspace/@id = 'admin'">
+                        <xsl:value-of select="foundry:get-static-text('portal-workspace', 'admin/link')"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <a href="{foundry:parse-link(concat($data-tree/portal:workspace/portal:workspaceDetails//primaryURL, 'admin/index.jsp'))}"
+                           title="{foundry:get-static-text('portal-workspace', 'admin/title')}">
+                            <xsl:value-of select="foundry:get-static-text('portal-workspace', 'admin/link')"/>
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:if>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="portal-workspace//portal-workspace-columns">
+        <xsl:apply-templates>
+            <xsl:with-param name="use-default-styles"
+                            tunnel="yes"
+                            select="./@use-default-styles = 'true'"/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template match="portal-workspace//portal-workspace-columns/portal-workspace-column">
+        <xsl:param name="use-default-styles"
+                   as="xs:boolean"
+                   tunnel="yes"
+                   select="true()"/>
+        
+        <xsl:variable name="column-layout-tree" select="./*"/>
+        
+        <!--<pre>
+            <xsl:value-of select="concat('cell-number per split(layout) = ', 
+                                                    count(tokenize($data-tree/portal:workspace/portal:portal/@layout, ',')))"/>
+        </pre>
+        <pre>
+            <xsl:value-of select="concat('cell-number per max(cellNumber) = ', 
+                                                    max($data-tree/portal:workspace/portal:portal/bebop:portlet/@cellNumber))"/>
+        </pre>
+        
+        <xsl:for-each select="tokenize($data-tree/portal:workspace/portal:portal/@layout, ',')">
+            <pre>
+                <xsl:value-of select="concat('column: ', position(), '; width = ', current())"/>
+            </pre>
+        </xsl:for-each>-->
+        
+        <xsl:for-each select="tokenize($data-tree/portal:workspace/portal:portal/@layout, ',')">
+            <div>
+                <xsl:if test="$use-default-styles">
+                    <xsl:attribute name="style" 
+                                   select="concat('float:left; width = ', current(), ';')"/>
+                </xsl:if>
+                
+                <xsl:variable name="col-number" select="position()"/>
+                
+                <xsl:apply-templates select="$column-layout-tree">
+                    <xsl:with-param name="workspace-portlets"
+                                    tunnel="yes"
+                                    select="$data-tree/portal:workspace/portal:portal/bebop:portlet[@cellNumber = $col-number]"/>
+                </xsl:apply-templates>
+            </div>
+        </xsl:for-each>
+        
+    </xsl:template>
+    
+    <xsl:template match="portal-workspace//portal-workspace-columns/portal-workspace-column//portal-workspace-portlets">
+        <xsl:param name="workspace-portlets" tunnel="yes"/>
+        
+        <xsl:apply-templates select="$workspace-portlets"/>
+    </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl
index e9628206a..15214a90b 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/lib/utils.xsl
@@ -170,7 +170,23 @@ XSLT 2.0 functions.
     <xsl:function name="foundry:gen-path" as="xs:string">
         <xsl:param name="path" as="xs:string"/>
         
-        <xsl:sequence select="concat($theme-prefix, '/', $path)"/>
+        <!--<xsl:sequence select="concat($theme-prefix, '/', $path)"/>-->
+        <xsl:sequence select="foundry:gen-path($path, false())"/>
+     </xsl:function>
+     
+     <xsl:function name="foundry:gen-path" as="xs:string">
+         <xsl:param name="path" as="xs:string"/>
+         <xsl:param name="internal" as="xs:boolean"/>
+         
+         <xsl:choose>
+             <xsl:when test="$internal = true()">
+                 <xsl:sequence select="concat($theme-prefix, '/foundry/', $path)"/>
+             </xsl:when>
+             <xsl:otherwise>
+                 <xsl:sequence select="concat($theme-prefix, '/', $path)"/>
+             </xsl:otherwise>
+         </xsl:choose>
+         
      </xsl:function>
     
     <foundry:doc section="devel" type="function">
@@ -515,7 +531,7 @@ XSLT 2.0 functions.
             <xsl:when test="$node and $node != ''">
                 <xsl:sequence select="$node"/>
             </xsl:when>
-            <xsl:when test="$module = ''">
+            <xsl:when test="$module = '' and document(foundry:gen-path('conf/global.xml'))/foundry:configuration/setting[@id=$setting]">
                 <xsl:sequence select="document(foundry:gen-path('conf/global.xml'))/foundry:configuration/setting[@id=$setting]"/>
             </xsl:when>
             <xsl:when test="not($module = '') and document(foundry:gen-path(concat('conf/', $module, '.xml')))/foundry:configuration/setting[@id=$setting]">
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl b/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl
index 35a968e2b..1263522da 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/main.xsl
@@ -37,7 +37,7 @@
     
     <xsl:template match="bebop:page">
         
-        <xsl:variable name="application">
+        <!--<xsl:variable name="application">
             <xsl:choose>
                 <xsl:when test="./@application">
                     <xsl:value-of select="./@application"/>
@@ -46,12 +46,13 @@
                     <xsl:value-of select="'none'"/>
                 </xsl:otherwise>
             </xsl:choose>
-        </xsl:variable>
+        </xsl:variable>-->
         
         <xsl:variable name="class" select="@class" />
         
         <xsl:variable name="app-layout-template-file" 
-                      select="foundry:get-app-layout-template($application, $class)"/>
+                      select="foundry:get-app-layout-template(foundry:get-current-application(), 
+                                                              foundry:get-current-application-class())"/>
         
         <xsl:choose>
             <xsl:when test="$app-layout-template-file = ''">
@@ -66,8 +67,8 @@
                     <xsl:with-param name="template-file"
                                     select="$app-layout-template-file"/>
                     <xsl:with-param name="internal" 
-                                    select="foundry:app-layout-template-is-internal($application, 
-                                                                                    $class)"/>
+                                    select="foundry:app-layout-template-is-internal(foundry:get-current-application(), 
+                                                                                    foundry:get-current-application-class())"/>
                 </xsl:call-template>
             </xsl:otherwise>
         </xsl:choose>
@@ -117,6 +118,28 @@
         </xsl:choose>-->
     </xsl:template>
 
+    <xsl:function name="foundry:get-current-application">
+        <xsl:choose>
+            <xsl:when test="$data-tree/@application">
+                <xsl:sequence select="$data-tree/@application"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="'none'"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+    
+    <xsl:function name="foundry:get-current-application-class">
+        <xsl:choose>
+            <xsl:when test="$data-tree/@class">
+                <xsl:sequence select="$data-tree/@class"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="'none'"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+
     <xsl:function name="foundry:get-app-layout-template">
         <xsl:param name="application" as="xs:string"/>
         <xsl:param name="class" as="xs:string"/>
@@ -147,7 +170,7 @@
         
         <xsl:choose>
             <xsl:when test="document(foundry:gen-path('conf/templates.xml'))/templates/applications/application[@name=$application and @class=$class]">
-                <xsl:sequence select="document(foundry:gen-path('conf/templates.xml'))/templates/applications/application[@name=$application and @class=$class]/@interal = 'true'"/>
+                <xsl:sequence select="document(foundry:gen-path('conf/templates.xml'))/templates/applications/application[@name=$application and @class=$class]/@internal = 'true'"/>
             </xsl:when>
             <xsl:when test="document(foundry:gen-path('conf/templates.xml'))/templates/applications/application[@name=$application and not(@class)]">
                 <xsl:sequence select="document(foundry:gen-path('conf/templates.xml'))/templates/applications/application[@name=$application and not(@class)]/@internal = 'true'"/>
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/styles/admin.css b/ccm-sci-bundle/web/themes/foundry/foundry/styles/admin.css
index 90badbc27..f6600323a 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/styles/admin.css
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/styles/admin.css
@@ -220,7 +220,7 @@ div#cms-header .logo img {
     height: 100%;
 }
 
-div#cms-header .logo{
+div#cms-header .logo, div#cms-footer .logo{
     float: left;
 }
 
@@ -564,13 +564,13 @@ div#right div.column-content{
     width: 100%;
 }
 
-div#right div.column-head .contenttitle {
+div#right div.column-head .content-title {
     float: left;
     line-height: 30px;
     padding: 0 1em;
 }
 
-div#right div.column-head .contenttitle h1 {
+div#right div.column-head .content-title h1 {
     margin: 0;
     border: none;
     font:inherit;
@@ -587,18 +587,18 @@ div#right div.column-head #contentlanguagewidget{
 }
 */
 
-div#right div.column-head #contentviewmenu{
+div#right div.column-head #content-view-menu{
     float: right;
     padding: 0 1em;
     line-height: 30px;
 }
 
-div#right div.column-head #contentviewmenu .cms-contentViewMenu,
-div#right div.column-head #contentviewmenu .cms-global-navigation {
+div#right div.column-head #content-view-menu .cms-content-view-menu,
+div#right div.column-head #content-view-menu .cms-global-navigation {
     float: left;
 }
 
-div#right div.column-head #contentviewmenu a {
+div#right div.column-head #content-view-menu a {
     color:white;
 }
 
@@ -716,7 +716,7 @@ table + form {
     margin-top: 1em;
 }
 
-div.endFloat {
+div.end-float {
     clear: both;
     float: none;
 }
@@ -1410,7 +1410,7 @@ dl dd a:hover {
 .tile div + div {
     height: auto;
 }
-
+s
 img.cmsImageDisplay {
     float: left;
     max-height: 200px;
@@ -1422,7 +1422,7 @@ div.cmsImageInfoOverlay {
     margin-left: 2em;
 }
 
-div#cmsFooter{
+div#cms-footer{
     position: absolute;
     top: auto;
     bottom: 0px;
@@ -1433,7 +1433,7 @@ div#cmsFooter{
     font-size: 0.72em;
 }
 
-div#cmsFooter .systemInformation {
+div#cms-footer .system-information {
     float: left;
     width: 25%;
     color: #a4a4a4;
@@ -1442,31 +1442,31 @@ div#cmsFooter .systemInformation {
     vertical-align: 30px;
 }
 
-div#cmsFooter .systemInformation a {
+div#cms-footer .system-information a {
     color: inherit !important;
 }
-div#cmsFooter .systemInformation a:hover {
+div#cms-footer .system-information a:hover {
     color: #ffffff;
 }
-div#cmsFooter .systemInformation .version {
+div#cms-footer .system-information .version {
     font-weight: normal;
 }
 
-div#cmsFooter .cms-global-navigation{
+div#cms-footer .cms-global-navigation{
     float: left;
     line-height: 30px;
     font-weight: bold;
 }
 
-div#cmsFooter .cms-global-navigation span:hover {
+div#cms-footer .cms-global-navigation span:hover {
     color: #ffffff;
 }
 
-div#cmsFooter .cms-global-navigation span a {
+div#cms-footer .cms-global-navigation span a {
     color: inherit !important;
 }
 
-div#cmsFooter .cms-global-navigation + .cms-global-navigation {
+div#cms-footer .cms-global-navigation + .cms-global-navigation {
     float: right;
 }
 div.column-content div.navbar{
@@ -1706,7 +1706,7 @@ table span.hint{
     line-height: 2em;
 }*/
 
-#cms-header, #cmsFooter {
+#cms-header, #cms-footer {
     min-width: 1200px;
 }
 
diff --git a/ccm-sci-bundle/web/themes/foundry/foundry/templates/admin-layout.xml b/ccm-sci-bundle/web/themes/foundry/foundry/templates/admin-layout.xml
index a7077b456..2cef00520 100644
--- a/ccm-sci-bundle/web/themes/foundry/foundry/templates/admin-layout.xml
+++ b/ccm-sci-bundle/web/themes/foundry/foundry/templates/admin-layout.xml
@@ -12,7 +12,8 @@
         <div id="cms-header" class="header-height">
             <div class="min-width">
                 <div class="logo">
-                    <img src-static="foundry/images/scientificcms_logo.png"/>
+                    <!--<img src-static="foundry/images/scientificcms_logo.png"/>-->
+                    <site-logo/>
                 </div>
                 
                 <div id="userwidget" class="cmsHeaderMenu">
@@ -51,7 +52,35 @@
                 </div>
             </div>
             <div id="right">
-                <h1>Admin</h1>
+                <div class="column-head">
+                    <div class="content-title">
+                        <show-bebop-page-title/>
+                    </div>
+                </div>
+                <div id="content-view-menu">
+                    <show-cms-content-view-menu/>
+                    <show-cms-global-navigation>
+                        <show-preview-link/>
+                    </show-cms-global-navigation>
+                </div>
+                <div id="content" class="column-content">
+                    <show-body-column/>
+                </div>
+            </div>
+            <div class="end-float"/>
+        </div>
+        
+        <div id="cms-footer">
+            <div class="min-width">
+                <show-system-information/>
+                <show-cms-global-navigation>
+                    <show-contentcenter-link/>
+                    <show-workspace-link/>
+                    <show-admincenter-link/>
+                </show-cms-global-navigation>
+                <show-cms-global-navigation>
+                    <use-help-link/>
+                </show-cms-global-navigation>
             </div>
         </div>
     </body>
diff --git a/ccm-sci-bundle/web/themes/foundry/templates/portal-workspace.xml b/ccm-sci-bundle/web/themes/foundry/templates/portal-workspace.xml
new file mode 100644
index 000000000..5ea46fa1f
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/templates/portal-workspace.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page-layout>
+    <head>
+        <title>
+            <separator>: </separator>
+            <show-text>layout/page/head/title</show-text>
+            <show-page-title/>
+        </title>
+        <load-css-files/>
+    </head>
+    <body>
+        <nav>
+            <navigation-home-link>
+                <a>
+                    <navigation-title/>
+                </a>
+            </navigation-home-link>
+            <h1>
+                <show-text>layout/page/head/title</show-text>: <show-page-title/>
+            </h1>
+            <navigation>
+                <div class="nav-wrapper">
+                    <navigation-links>
+                        <ul>
+                            <navigation-link>
+                                <li>
+                                    <a>
+                                        <navigation-link-label/>
+                                    </a>
+                                    <navigation-sublinks/>
+                                </li>
+                            </navigation-link>
+                        </ul>
+                    </navigation-links>
+                </div>
+            </navigation>
+            <breadcrumbs>
+                <div id="breadcrumbs">
+                    <breadcrumb-link>
+                        <a>
+                            <breadcrumb-label mode="mark"/>
+                        </a>
+                    </breadcrumb-link>
+                </div>
+                <breadcrumb-separator>
+                    <span class="breadcrumb-separator">/</span>
+                </breadcrumb-separator>
+            </breadcrumbs>
+        </nav>
+        <main>
+            <portal-workspace>
+                <divIfNotEmpty id="portal-workspace-edit-links" class="workspace-details">
+                    <portal-workspace-edit-links/>
+                </divIfNotEmpty>
+                <portal-workspace-columns use-default-styles="true">
+                    <portal-workspace-column>
+                        <div>
+                            <portal-workspace-portlets/>
+                        </div>
+                    </portal-workspace-column>
+                </portal-workspace-columns>
+            </portal-workspace>
+        </main>
+    </body>
+</page-layout>
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/foundry/texts/portal-workspace.xml b/ccm-sci-bundle/web/themes/foundry/texts/portal-workspace.xml
new file mode 100644
index 000000000..ee10d4d97
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/foundry/texts/portal-workspace.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<foundry:static-texts xmlns:foundry="http://foundry.libreccm.org">
+    
+    <text id="admin/link">
+        <translation lang="de">Administrieren</translation>
+        <translation lang="en">Admin</translation>
+    </text>
+    <text id="admin/title">
+        <translation lang="de">Administrieren</translation>
+        <translation lang="en">Admin</translation>
+    </text>
+    
+    <text id="edit/link">
+        <translation lang="de">Bearbeiten</translation>
+        <translation lang="en">Edit</translation>
+    </text>
+    <text id="edit/title">
+        <translation lang="de">Bearbeiten</translation>
+        <translation lang="en">Edit</translation>
+    </text>
+    
+    <text id="view/link">
+        <translation lang="de">Ansehen</translation>
+        <translation lang="en">View</translation>
+    </text>
+    <text id="view/title">
+        <translation lang="de">Ansehen</translation>
+        <translation lang="en">View</translation>
+    </text>
+    
+    
+    
+</foundry:static-texts>
\ No newline at end of file