diff --git a/ccm-core/web/themes/foundry-base/conf/bebop-contextbar.xsl b/ccm-core/web/themes/foundry-base/conf/bebop-contextbar.xml
similarity index 100%
rename from ccm-core/web/themes/foundry-base/conf/bebop-contextbar.xsl
rename to ccm-core/web/themes/foundry-base/conf/bebop-contextbar.xml
diff --git a/ccm-core/web/themes/foundry-base/conf/css-files.xml b/ccm-core/web/themes/foundry-base/conf/css-files.xml
index 170818cfb..1bcb2d2f1 100644
--- a/ccm-core/web/themes/foundry-base/conf/css-files.xml
+++ b/ccm-core/web/themes/foundry-base/conf/css-files.xml
@@ -3,18 +3,21 @@
     <application name="admin">
         <css-file origin="internal">admin.css</css-file>
     </application>
-    <application name="cms-admin">
+    <application name="login">
         <css-file origin="internal">admin.css</css-file>
     </application>
     <application name="navigation">
         <css-file>public.css</css-file>
         <css-file media="screen">public.css</css-file>
     </application>
-        <application name="navigation" class="portalGridPage">
+    <application name="navigation" class="portalGridPage">
         <css-file media="screen">portal.css</css-file>
         <css-file>public.css</css-file>
         <css-file media="screen">public.css</css-file>
     </application>
+    <application name="none" class="cms-admin">
+        <css-file origin="internal">admin.css</css-file>
+    </application>
     <application name="portal">
         <css-file media="screen">portal.css</css-file>
         <css-file>public.css</css-file>
@@ -23,5 +26,5 @@
     <default>
         <css-file>public.css</css-file>
         <css-file media="screen">public.css</css-file>
-</default>
+    </default>
 </css-files>
\ No newline at end of file
diff --git a/ccm-core/web/themes/foundry/conf/bebop-contextbar.xsl b/ccm-core/web/themes/foundry/conf/bebop-contextbar.xml
similarity index 100%
rename from ccm-core/web/themes/foundry/conf/bebop-contextbar.xsl
rename to ccm-core/web/themes/foundry/conf/bebop-contextbar.xml
diff --git a/ccm-core/web/themes/foundry/conf/css-files.xml b/ccm-core/web/themes/foundry/conf/css-files.xml
index 91c3f2ed2..ac7d54777 100644
--- a/ccm-core/web/themes/foundry/conf/css-files.xml
+++ b/ccm-core/web/themes/foundry/conf/css-files.xml
@@ -3,17 +3,19 @@
     <application name="admin">
         <css-file origin="internal">admin.css</css-file>
     </application>
-    <application name="cms-admin">
+    <application name="login">
         <css-file origin="internal">admin.css</css-file>
     </application>
     <application name="navigation">
-        <css-file>bootstrap/css/bootstrap.min.css</css-file>
         <css-file>public.css</css-file>
     </application>
     <application name="navigation" class="portalGridPage">
         <css-file>portal.css</css-file>
         <css-file>public.css</css-file>
     </application>
+    <application name="none" class="cms-admin">
+        <css-file origin="internal">admin.css</css-file>
+    </application>
     <application name="portal">
         <css-file>portal.css</css-file>
         <css-file>public.css</css-file>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
index 452128446..5a0ff88ee 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
@@ -84,16 +84,6 @@
     </foundry:doc>
     <xsl:template match="show-text">
         <xsl:variable name="module" select="if (./@module) then ./@module else ''"/>
-        <!--<xsl:variable name="module">
-            <xsl:choose>
-                <xsl:when test="./@module">
-                    <xsl:value-of select="./@module"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:value-of select="''"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>-->
         
         <xsl:choose>
             <xsl:when test="@id != '' or @class != '' or with-colorset = 'true'">
@@ -108,4 +98,20 @@
         </xsl:choose>
     </xsl:template>
     
+    <xsl:template match="show-internal-text">
+        <xsl:variable name="module" select="if (./@module) then ./@module else ''"/>
+        
+        <xsl:choose>
+            <xsl:when test="@id != '' or @class != '' or with-colorset = 'true'">
+                <span>
+                    <xsl:call-template name="foundry:set-id-and-class"/>
+                    <xsl:value-of select="foundry:get-internal-static-text($module, .)"/>
+                </span>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="foundry:get-internal-static-text($module, .)"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
 </xsl:stylesheet>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/utils.xsl b/ccm-core/web/themes/foundry/foundry/lib/utils.xsl
index 90f52291e..a98f6f611 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/utils.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/utils.xsl
@@ -703,34 +703,32 @@
         <xsl:param name="lang" as="xs:string"/>
         <xsl:param name="internal" as="xs:boolean"/>
         
-        <!--<xsl:message>
+        <xsl:variable name="origin" 
+                      select="if ($internal)
+                              then 'internal'
+                              else ''"/>
+        
+        <xsl:message>
             <xsl:value-of select="foundry:message-info('get-static-text(string, string, boolean, string) called')"/>
         </xsl:message>
         <xsl:message>
-            <xsl:value-of select="foundry:message-info(concat('Trying to get ', $theme-prefix, '/texts/', $module ,'.xml/foundry:static-texts/text[@id=', $id, ']/translation[@lang = ', $lang, ']'))"/>
-        </xsl:message>-->
-        
-        <xsl:variable name="text-dir">
-            <xsl:choose>
-                <xsl:when test="$internal">
-                    <xsl:value-of select="'foundry/texts'"/>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:value-of select="'texts'"/>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
+            <xsl:value-of select="foundry:message-info(concat('Trying to get ', 
+                                                       foundry:gen-path(concat('texts/', 
+                                                                               $module, 
+                                                                               '.xml')), 
+                                                       '/foundry:static-texts/text[@id=', $id, ']/translation[@lang = ', $lang, ']'))"/>
+        </xsl:message>
         
         
         <xsl:choose>
-            <xsl:when test="$module = '' and document(foundry:gen-path(concat($text-dir, '/global.xml')))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]">
+            <xsl:when test="$module = '' and document(foundry:gen-path('texts/global.xml', $origin))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]">
                 <xsl:message>
                     <xsl:value-of select="'using global.xml for texts...'"/>
                 </xsl:message>
-                <xsl:sequence select="document(foundry:gen-path(concat($text-dir, '/global.xml')))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"/>
+                <xsl:sequence select="document(foundry:gen-path('texts/global.xml', $origin))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"/>
             </xsl:when>
-            <xsl:when test="not($module = '') and document(foundry:gen-path(concat($text-dir, '/', $module, '.xml')))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]">
-                <xsl:sequence select="document(foundry:gen-path(concat($text-dir, '/', $module, '.xml')))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"/>
+            <xsl:when test="not($module = '') and document(foundry:gen-path(concat('texts/', $module, '.xml'), $origin))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]">
+                <xsl:sequence select="document(foundry:gen-path(concat('texts/', $module, '.xml'), $origin))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"/>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:message>
@@ -750,10 +748,10 @@
                                     <span class="foundry-missing-translation-path">
                                         <xsl:choose>
                                             <xsl:when test="$module = ''">
-                                                <xsl:value-of select="document(foundry:gen-path(concat($text-dir, '/global.xml')))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"/>
+                                                <xsl:value-of select="concat(foundry:gen-path('texts/global.xml'), '/foundry:static-texts/text[@id=', $id, ']/translation[@lang=', $lang, ']')"/>
                                             </xsl:when>
                                             <xsl:otherwise>
-                                                <xsl:value-of select="document(foundry:gen-path(concat($text-dir, '/', $module, '.xml')))/foundry:static-texts/text[@id=$id]/translation[@lang=$lang]"/>
+                                                <xsl:value-of select="concat(foundry:gen-path(concat('texts/', $module, '.xml')), '/foundry:static-texts/text[@id=', $id, ']/translation[@lang=', $lang, ']')"/>
                                             </xsl:otherwise>
                                         </xsl:choose>
                                     </span>