diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index 2b006b4dc..574609618 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -4,105 +4,73 @@
 }
 <!--@if($db_info->use_html5=='Y')-->
 <!DOCTYPE html>
-<html lang="{$lang_type}">
 <!--@else-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="{$lang_type}" xml:lang="{$lang_type}" xmlns="http://www.w3.org/1999/xhtml">
 <!--@end-->
+<html lang="{$lang_type}" xmlns="http://www.w3.org/1999/xhtml"|cond="$db_info->use_html5!='Y'">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta name="Generator" content="XpressEngine" />
-	{@ $meta_tags = Context::getMetaTag() }
-	<block loop="$meta_tags=>$key,$meta_tag">
-	<meta http-equiv="{$meta_tag['name']}" content="{$meta_tag['content']}" cond="$meta_tag['is_http_equiv']" />
-	<meta name="{$meta_tag['name']}" content="{$meta_tag['content']}" cond="!$meta_tag['is_http_equiv']" />
-	</block>
+{@$meta_tags=Context::getMetaTag()}
+{@$css_files=Context::getCssFile()}
+{@$js_files=Context::getJsFile()}
+<!-- META -->
+	<meta charset="UTF-8" cond="$db_info->use_html5=='Y'"/><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" cond="$db_info->use_html5!='Y'" />
 
-<!--@if($module_info->module)-->
-    <meta name="module" content="{$module_info->module}" />
-<!--@end-->
-<!--@if($module_info->skin)-->
-    <meta name="module_skin" content="{$module_info->skin}" />
-<!--@end-->
-<!--@if($layout_info->title)-->
-    <meta name="layout" content="{$layout_info->title} ({$layout_info->layout})" />
-<!--@end-->
-<!--@if($layout_info->author)-->
-    <!--@foreach($layout_info->author as $author)-->
-    <meta name="layout_maker" content="{$author->name} ({$author->homepage})" />
-    <!--@endforeach-->
-<!--@end-->
-    <meta http-equiv="imagetoolbar" content="no" />
-    <title>{Context::getBrowserTitle()}</title>
-{@ $css_files = Context::getCssFile() }
-<!--@foreach($css_files as $key => $css_file)-->
-	<!--@if($css_file['targetie'])-->
-		<!--[if {$css_file['targetie']}]>
-	<!--@end-->
-		<link rel="stylesheet" href="{$css_file['file']}" type="text/css" charset="UTF-8" media="{$css_file['media']}" />
-	<!--@if($css_file['targetie'])-->
-		<![endif]-->
-	<!--@end-->
-<!--@end-->
-{@ $js_files = Context::getJsFile() }
-<!--@foreach($js_files as $key => $js_file)-->
-	<!--@if($js_file['targetie'])-->
-		<!--[if {$js_file['targetie']}]>
-	<!--@end-->
-		<script type="text/javascript" src="{$js_file['file']}"></script>
-	<!--@if($js_file['targetie'])-->
-		<![endif]-->
-	<!--@end-->
-<!--@end-->
-<!--[if lt IE 9]>
-<script type="text/javascript" src="../js/html5.js" cond="$db_info->use_html5=='Y'"></script>
-<![endif]-->
-<!--@if($rss_url)-->
-    <link rel="alternate" type="application/rss+xml" title="RSS" href="{$rss_url}" />
-    <link rel="alternate" type="application/atom+xml" title="Atom" href="{$atom_url}" />
-<!--@end-->
-<!--@if($general_rss_url)-->
-    <link rel="alternate" type="application/rss+xml" title="Site RSS" href="{$general_rss_url}" />
-    <link rel="alternate" type="application/atom+xml" title="Site Atom" href="{$general_atom_url}" />
-<!--@end-->
+	<meta name="Generator" content="XpressEngine" />
+<!-- TITLE -->
+	<title>{Context::getBrowserTitle()}</title>
+<!-- CSS -->
+<block loop="$css_files=>$key,$css_file">
+<block cond="$css_file['targetie']"><!--[if {$css_file['targetie']}]></block>
+	<link rel="stylesheet" href="{$css_file['file']}" type="text/css"|cond="$db_info->use_html5!='Y'" media="{$css_file['media']}" />
+<block cond="$css_file['targetie']"><![endif]--></block>
+</block>
+<!-- JS -->
+<block loop="$js_files=>$key,$js_file">
+<block cond="$js_file['targetie']"><!--[if {$js_file['targetie']}]></block>
+	<script type="text/javascript"|cond="$db_info->use_html5!='Y'" src="{$js_file['file']}"></script>
+<block cond="$js_file['targetie']"><![endif]--></block>
+</block>
+	<block cond="$db_info->use_html5=='Y'"><!--[if lt IE 9]><script src="../js/html5.js"></script><![endif]--></block>
 
-<link cond="$favicon_url" rel="shortcut icon" href="{$favicon_url}" />
-<link cond="$mobicon_url" rel="apple-touch-icon" href="{$mobicon_url}" />
+<!-- RSS -->
+	<link rel="alternate" type="application/rss+xml" title="RSS" href="{$rss_url}" cond="$rss_url" /><link rel="alternate" type="application/rss+xml" title="Site RSS" href="{$general_rss_url}" cond="$general_rss_url" />
 
-{@ $ssl_actions = Context::getSSLActions() }
-    <script type="text/javascript">//<![CDATA[
-        var current_url = "{$current_url}";
-        var request_uri = "{$request_uri}";
-<!--@if($vid)-->var xeVid = "{$vid}";<!--@end-->
-        var current_mid = "{$mid}";
-        var waiting_message = "{$lang->msg_call_server}";
-        var ssl_actions = new Array(<!--@if(count($ssl_actions))-->"{implode('","',$ssl_actions)}"<!--@end-->);
-        var default_url = "{Context::getDefaultUrl()}";
-        <!--@if(Context::get("_http_port"))-->var http_port = {Context::get("_http_port")};<!--@end-->
-        <!--@if(Context::get("_https_port"))-->var https_port = {Context::get("_https_port")};<!--@end-->
-        <!--@if(Context::get("_use_ssl") && Context::get("_use_ssl") == "always")-->var enforce_ssl = true;<!--@end-->
+	<link rel="alternate" type="application/atom+xml" title="Atom" href="{$atom_url}" cond="$rss_url" /><link rel="alternate" type="application/atom+xml" title="Site Atom" href="{$general_atom_url}" cond="$general_rss_url" />
 
-    //]]></script>
-
-    {Context::getHtmlHeader()}
+<!-- ICON -->
+	<link cond="$favicon_url" rel="shortcut icon" href="{$favicon_url}" />
 
+	<link cond="$mobicon_url" rel="apple-touch-icon" href="{$mobicon_url}" />
+{Context::getHtmlHeader()}
 </head>
 <body{Context::getBodyClass()}>
-    {Context::getBodyHeader()}
 
-    {$content}
+	{Context::getBodyHeader()}
 
-    {Context::getHtmlFooter()}
-<div class="wfsr"></div>
-{@ $js_body_files = Context::getJsFile('body') } 
-<!--@foreach($js_body_files as $key => $js_file)-->
-<!--@if($js_file['targetie'])-->
-    <!--[if {$js_file['targetie']}]>
-<!--@end-->
-    <script type="text/javascript" src="{$js_file['file']}"></script>
-<!--@if($js_file['targetie'])-->
-    <![endif]-->
-<!--@end-->
-<!--@end-->
+	{$content}
+
+	{Context::getHtmlFooter()}
+<!-- ETC -->
+	<div class="wfsr"></div>
+{@$ssl_actions=Context::getSSLActions()}
+	<script type="text/javascript"|cond="$db_info->use_html5!='Y'">
+	//<![CDATA[
+	var current_url = "{$current_url}";
+	var request_uri = "{$request_uri}";
+<block cond="$vid">var xeVid = "{$vid}";</block>
+	var current_mid = "{$mid}";
+	var waiting_message = "{$lang->msg_call_server}";
+	var ssl_actions = new Array(<block cond="count($ssl_actions)">"{implode('","',$ssl_actions)}"</block>);
+	var default_url = "{Context::getDefaultUrl()}";
+<block cond="Context::get('_http_port')">var http_port = {Context::get("_http_port")};</block>
+<block cond="Context::get('_https_port')">var https_port = {Context::get("_https_port")};</block>
+<block cond="Context::get('_use_ssl') && Context::get('_use_ssl') == 'always'">var enforce_ssl = true;</block>
+	//]]>
+	</script>
+{@ $js_body_files = Context::getJsFile('body') }
+<block loop="$js_body_files => $key, $js_file">
+	<block cond="$js_file['targetie']"><!--[if {$js_file['targetie']}]></block><script type="text/javascript"|cond="$db_info->use_html5!='Y'" src="{$js_file['file']}"></script><block cond="$js_file['targetie']"><![endif]--></block>
+
+</block>
 </body>
 </html>
