Index: branches/release-41/tmpl/cms/include/chromeless_header.tmpl
===================================================================
--- branches/release-41/tmpl/cms/include/chromeless_header.tmpl (revision 2543)
+++ branches/release-41/tmpl/cms/include/chromeless_header.tmpl (revision 2704)
@@ -2,35 +2,33 @@
 <html>
 <head>
-
-<meta http-equiv="Content-Type" content="text/html; charset=<$mt:var name="language_encoding"$>" />
+    <meta http-equiv="Content-Type" content="text/html; charset=<$mt:var name="language_encoding"$>" />
     <title><mt:if name="html_title"><mt:var name="html_title"><mt:else><mt:var name="page_title"></mt:if> | <$mt:var name="mt_product_name"$></title>
-
 <mt:setvarblock name="html_head" prepend="1">
+    <mt:unless name="cfg_exists">
     <link rel="icon" href="<$mt:var name="static_uri"$>images/favicon.ico" type="image/ico" />
-<mt:if name="mt_debug">
+        <mt:if name="mt_debug">
     <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/reset.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" />
     <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/utilities.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" />
     <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/messaging.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" />
     <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/chromeless.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" />
-<mt:else>
+        <mt:else>
     <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/simple.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" />
-</mt:if>
-
+        </mt:if>
     <!--[if IE]>
     <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/hacks/ie.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" />
     <![endif]-->
-<mt:if name="local_lang_id" ne="en-us">
+        <mt:if name="local_lang_id" ne="en-us">
     <link rel="stylesheet" href="<$mt:var name="static_uri"$>styles_<$mt:var name="local_lang_id"$>.css?v=<mt:var name="mt_version_id" escape="url">" />
-</mt:if>
-
-<script type="text/javascript" src="<$mt:var name="static_uri"$>js/common/Core.js?v=<mt:var name="mt_version_id" escape="url">"></script>
+        </mt:if>
+    <script type="text/javascript" src="<$mt:var name="static_uri"$>js/common/Core.js?v=<mt:var name="mt_version_id" escape="url">"></script>
     <script type="text/javascript" src="<$mt:var name="static_uri"$>js/tc.js?v=<mt:var name="mt_version_id" escape="url">"></script>
+    </mt:unless>
 </mt:setvarblock>
 <$mt:var name="html_head"$>
+<mt:unless name="cfg_exists">
 <script type="text/javascript" src="<$mt:var name="static_uri"$>mt.js?v=<mt:var name="mt_version_id" escape="url">"></script>
-<mt:if name="local_lang_id" ne="en-us">
+    <mt:if name="local_lang_id" ne="en-us">
 <script type="text/javascript" src="<$mt:var name="static_uri"$>mt_<$mt:var name="local_lang_id"$>.js?v=<mt:var name="mt_version_id" escape="URL">" charset="utf-8"></script>
-</mt:if>
-
+    </mt:if>
 <script language="javascript" type="text/javascript">
 /* <![CDATA[ */
@@ -45,4 +43,5 @@
 /* ]]> */
 </script>
+</mt:unless>
 <$mt:var name="js_include"$>
 </head>
