diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index a27e6db227..79f9b93b7b 100644
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -188,20 +188,7 @@ class Template extends Smarty {
 		
 		$this->assign('css_file_to_string', $css_file_to_string);
 		$this->assign('js_file_to_string',  $js_file_to_string);		
-		$this->assign('text_direction',	 api_get_text_direction());		
-
-	
-		//@todo add this
-		/*<link rel="top" href="<?php echo api_get_path(WEB_PATH); ?>index.php" title="" />
-		<link rel="courses" href="<?php echo api_get_path(WEB_CODE_PATH); ?>auth/courses.php" title="<?php echo api_htmlentities(get_lang('OtherCourses'), ENT_QUOTES); ?>" />
-		<link rel="profil" href="<?php echo api_get_path(WEB_CODE_PATH); ?>auth/profile.php" title="<?php echo api_htmlentities(get_lang('ModifyProfile'), ENT_QUOTES); ?>" />
-		<link href="http://www.chamilo.org/documentation.php" rel="Help" />
-		<link href="http://www.chamilo.org/team.php" rel="Author" />
-		<link href="http://www.chamilo.org" rel="Copyright" />
-		<meta http-equiv="Content-Type" content="text/html; charset=<?php echo api_get_system_encoding(); ?>" />
-		<meta name="Generator" content="<?php echo $_configuration['software_name'].' '.substr($_configuration['system_version'],0,1);?>" />
-		*/
-		
+		$this->assign('text_direction',	 api_get_text_direction());			
 		$this->assign('style_print', $style_print);
 		
 		$extra_headers = '';		
diff --git a/main/template/default/layout/head.tpl b/main/template/default/layout/head.tpl
index 0c43f8a21f..839f2e48cc 100644
--- a/main/template/default/layout/head.tpl
+++ b/main/template/default/layout/head.tpl
@@ -1,3 +1,13 @@
+<link href="http://www.chamilo.org/documentation.php" rel="Help" />
+<link href="http://www.chamilo.org/team.php" rel="Author" />
+<link href="http://www.chamilo.org" rel="Copyright" />
+<link rel="top" href="{$_p.web_main}index.php" title="" />
+<link rel="courses" href="{$_p.web_main}auth/courses.php" title="{"OtherCourses"|get_lang}"/>
+<link rel="profil" href="{$_p.web_main}auth/profile.php" title="{"ModifyProfile"|get_lang}"/>
+
+<meta http-equiv="Content-Type" content="text/html; charset={$system_charset}" />
+<meta name="Generator" content="{$_s.software_name} {$_s.system_version|substr:0:1}" />
+		
 <title>{$title_string}</title>
 
 <style type="text/css" media="screen, projection">
@@ -33,4 +43,4 @@ if ( ( navigator.userAgent.toLowerCase().indexOf('msie') != -1 ) && ( navigator.
 {$js_file_to_string}
 {$css_file_to_string}
 {$extra_headers}
-{$favico}
\ No newline at end of file
+{$favico}