diff --git a/ccm-core/web/themes/foundry/foundry/lib/bebop/context-bar.xsl b/ccm-core/web/themes/foundry/foundry/lib/bebop/context-bar.xsl
index d028c31dd..d1af2efe6 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/bebop/context-bar.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/bebop/context-bar.xsl
@@ -42,10 +42,7 @@
         <xsl:param name="layout-tree" select="."/>
     
         <xsl:variable name="separator" 
-                      select="foundry:get-setting('bebop-contextbar', 
-                                                  'separator', 
-                                                  ' -&gt; ', 
-                                                  ./@separator)"/>
+                      select="' -&gt; '"/>
 
         <div class="bebop-contextbar">
             <xsl:apply-templates>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/bebop/label.xsl b/ccm-core/web/themes/foundry/foundry/lib/bebop/label.xsl
index aad84255b..13f224f25 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/bebop/label.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/bebop/label.xsl
@@ -245,7 +245,7 @@
                 <xsl:attribute name="content">
                     <xsl:value-of select="../following-sibling::bebop:cell/*/@hint"/>
                 </xsl:attribute>
-                <xsl:value-of select="foundry:get-setting('bebop', 'hint-symbol', '&#x24d8;')"/>
+                <xsl:value-of select="'&#x24d8;'"/>
             </span>
         </xsl:if>
     </xsl:template>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/bebop/link.xsl b/ccm-core/web/themes/foundry/foundry/lib/bebop/link.xsl
index ad0732877..cd0cf24f0 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/bebop/link.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/bebop/link.xsl
@@ -99,7 +99,7 @@
                     <xsl:attribute name="content">
                         <xsl:value-of select="@hint"/>
                     </xsl:attribute>
-                    <xsl:value-of select="foundry:get-setting('bebop', 'hint-symbol', '&#x24d8;')"/>
+                    <xsl:value-of select="'&#x24d8;'"/>
                 </span>
             </xsl:if>
         </a>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/bebop/padding.xsl b/ccm-core/web/themes/foundry/foundry/lib/bebop/padding.xsl
index 206857664..3ae6d81d9 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/bebop/padding.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/bebop/padding.xsl
@@ -43,9 +43,9 @@
         <!-- DE Hole alle benötigten Einstellungen-->
         <!-- EN Getting all needed setting-->
         <xsl:variable name="show-padding" 
-                      select="foundry:get-setting('bebop', 'padding/show-padding', 'false')"/>
+                      select="'false'"/>
         <xsl:variable name="border-color" 
-                      select="foundry:get-setting('bebop', 'padding/border-color', 'ccc')"/>
+                      select="'ccc'"/>
 
         <xsl:choose>
             <xsl:when test="$show-padding = 'true'">
diff --git a/ccm-core/web/themes/foundry/foundry/lib/bebop/tabbed-pane.xsl b/ccm-core/web/themes/foundry/foundry/lib/bebop/tabbed-pane.xsl
index 54dcd39df..5b330b825 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/bebop/tabbed-pane.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/bebop/tabbed-pane.xsl
@@ -48,10 +48,7 @@
             </xsl:call-template>
             <xsl:apply-templates select="bebop:tabStrip">
                 <xsl:with-param name="tab-pane-mode"
-                                select="foundry:get-setting('bebop', 
-                                                            'tab-pane/mode', 
-                                                            'horizontal', 
-                                                            'tab-pane-mode')"/>
+                                select="'horizontal'"/>
             </xsl:apply-templates>
         </div>
     </xsl:template>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/bebop/table.xsl b/ccm-core/web/themes/foundry/foundry/lib/bebop/table.xsl
index fb7eb12a1..b5ad7fe2e 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/bebop/table.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/bebop/table.xsl
@@ -138,9 +138,7 @@
             <xsl:with-param name="alt" select="'[X]'"/>
             <xsl:with-param name="title" select="'[X]'"/>
             <xsl:with-param name="src" 
-                            select="foundry:parse-link(foundry:get-setting('bebop', 
-                                                                           'table/setImage/checkbox-checked', 
-                                                                           '/images/bebop/checkbox-checked.gif'), 
+                            select="foundry:gen-path('/images/bebop/checkbox-checked.gif', 
                                                        $theme-prefix)"/>
         </xsl:call-template>
     </xsl:template>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/bebop/widget.xsl b/ccm-core/web/themes/foundry/foundry/lib/bebop/widget.xsl
index 850d6716c..9e385f0f8 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/bebop/widget.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/bebop/widget.xsl
@@ -208,7 +208,7 @@
                         <xsl:attribute name="content">
                             <xsl:value-of select="@hint"/>
                         </xsl:attribute>
-                        <xsl:value-of select="foundry:get-setting('bebop', 'hint-symbol', '&#x24d8;')"/>
+                        <xsl:value-of select="'&#x24d8;'"/>
                     </span>
                 </xsl:if>
             </legend>
@@ -228,7 +228,7 @@
                         <xsl:attribute name="content">
                             <xsl:value-of select="@hint"/>
                         </xsl:attribute>                        
-                        <xsl:value-of select="foundry:get-setting('bebop', 'hint-symbol', '&#x24d8;')"/>
+                        <xsl:value-of select="'&#x24d8;'"/>
                     </span>
                 </xsl:if>
             </legend>
@@ -257,7 +257,7 @@
                         <xsl:attribute name="content">
                             <xsl:value-of select="@hint"/>
                         </xsl:attribute>
-                        <xsl:value-of select="foundry:get-setting('bebop', 'hint-symbol', '&#x24d8;')"/>
+                        <xsl:value-of select="'&#x24d8;'"/>
                     </span>
                 </xsl:if>
             </label>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/cms/item-summary.xsl b/ccm-core/web/themes/foundry/foundry/lib/cms/item-summary.xsl
index f8a478f6c..79815caea 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/cms/item-summary.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/cms/item-summary.xsl
@@ -231,16 +231,14 @@
                     )
                 </span>
             </span>
-            <xsl:if test="foundry:boolean(foundry:get-setting('cms', 'show-comments', 'true'))">
-                <xsl:if test="not(cms:taskComment)">
-                    <xsl:if test="foundry:boolean(foundry:get-setting('cms', 'show-none-comments', 'true'))">
-                        <span class="noInfo tableCell">
-                            <xsl:value-of select="foundry:get-static-text('cms', 'summary/workflow/noComment')"/>
-                        </span>
-                    </xsl:if>
-                </xsl:if>
-                <xsl:apply-templates/>
+            
+            <xsl:if test="not(cms:taskComment)">
+                <span class="noInfo tableCell">
+                    <xsl:value-of select="foundry:get-static-text('cms', 'summary/workflow/noComment')"/>
+                </span>
             </xsl:if>
+            <xsl:apply-templates/>
+            
         </div>
     </xsl:template>
     
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/admin/cms.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/admin/cms.xsl
index 5ad171812..12af710ec 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/admin/cms.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/admin/cms.xsl
@@ -143,10 +143,7 @@
         <xsl:param name="layoutTree" select="."/>
     
         <xsl:variable name="layout" 
-                      select="foundry:get-setting('cms', 
-                                                  'content-view-menu/layout',
-                                                  'horizontal',
-                                                  ./layout)"/>
+                      select="'horizontal'"/>
             
         <xsl:choose>
             <xsl:when test="$layout = 'horizontal'">
@@ -254,9 +251,7 @@
     a duplicated list below the list of category roots. -->
     <xsl:template match="cms:itemCategory" mode="list">
         <xsl:variable name="show-delete-link" 
-                      select="foundry:get-setting('cms', 
-                                                  'category-step-summary/show-delete-link', 
-                                                  'false')"/>
+                      select="'false'"/>
         
         <li>
             <xsl:choose>