diff --git a/include/footer.inc.php b/include/footer.inc.php
index 582508f81..ff1a136f0 100644
--- a/include/footer.inc.php
+++ b/include/footer.inc.php
@@ -51,7 +51,7 @@
 
 // this js is indep of the theme used:
 ?>
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 //<!--z
 var selected;
 function rowselect(obj) {
diff --git a/include/html/languages.inc.php b/include/html/languages.inc.php
index b95a39495..5631dfa0d 100644
--- a/include/html/languages.inc.php
+++ b/include/html/languages.inc.php
@@ -17,7 +17,7 @@
 	return;
 }
 ?>
-<div align="center" id="langdiv" style="clear: left"><br /><?php
+<div id="langdiv" style="clear: left"><br /><?php
 
 	if ($languageManager->getNumLanguages() > 5) {
 		echo '<form method="get" action="'.AT_print($_my_uri,'url.base').'">';
diff --git a/include/lib/tinymce.inc.php b/include/lib/tinymce.inc.php
index f8337ab38..11c59bebf 100644
--- a/include/lib/tinymce.inc.php
+++ b/include/lib/tinymce.inc.php
@@ -43,8 +43,8 @@ function load_editor($simple = TRUE, $name = FALSE, $mode="textareas") {
 //insert predefined template: template
 //insert page break: pagebreak
 
-echo '<script language="javascript" type="text/javascript" src="'.AT_BASE_HREF.'jscripts/tiny_mce/tiny_mce.js"></script>
-<script language="javascript" type="text/javascript">';
+echo '<script type="text/javascript" src="'.AT_BASE_HREF.'jscripts/tiny_mce/tiny_mce.js"></script>
+<script type="text/javascript">';
 
 echo 'ATutor = ATutor || {};
       ATutor.tinymce = ATutor.tinymce || {};
diff --git a/jscripts/tiny_mce/plugins/advimage/js/image.js b/jscripts/tiny_mce/plugins/advimage/js/image.js
index f0b7c6eef..6c77a16c7 100644
--- a/jscripts/tiny_mce/plugins/advimage/js/image.js
+++ b/jscripts/tiny_mce/plugins/advimage/js/image.js
@@ -5,7 +5,7 @@ var ImageDialog = {
 		tinyMCEPopup.requireLangPack();
 
 		if (url = tinyMCEPopup.getParam("external_image_list_url"))
-			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+			document.write('<script type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
 	},
 
 	init : function(ed) {
diff --git a/jscripts/tiny_mce/plugins/advlink/js/advlink.js b/jscripts/tiny_mce/plugins/advlink/js/advlink.js
index 9ca955c92..b8f98f2b1 100644
--- a/jscripts/tiny_mce/plugins/advlink/js/advlink.js
+++ b/jscripts/tiny_mce/plugins/advlink/js/advlink.js
@@ -10,7 +10,7 @@ function preinit() {
 	var url;
 
 	if (url = tinyMCEPopup.getParam("external_link_list_url"))
-		document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+		document.write('<script type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
 }
 
 function changeClass() {
diff --git a/jscripts/tiny_mce/plugins/media/js/media.js b/jscripts/tiny_mce/plugins/media/js/media.js
index f6a081a63..5a877cc87 100644
--- a/jscripts/tiny_mce/plugins/media/js/media.js
+++ b/jscripts/tiny_mce/plugins/media/js/media.js
@@ -2,7 +2,7 @@
 	var url;
 
 	if (url = tinyMCEPopup.getParam("media_external_list_url"))
-		document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+		document.write('<script type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
 
 	function get(id) {
 		return document.getElementById(id);
diff --git a/jscripts/tiny_mce/plugins/preview/example.html b/jscripts/tiny_mce/plugins/preview/example.html
index b2c3d90ce..46b12c7ea 100644
--- a/jscripts/tiny_mce/plugins/preview/example.html
+++ b/jscripts/tiny_mce/plugins/preview/example.html
@@ -1,6 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<script language="javascript" src="../../tiny_mce_popup.js"></script>
+<script src="../../tiny_mce_popup.js"></script>
 <script type="text/javascript" src="jscripts/embed.js"></script>
 <script type="text/javascript">
 tinyMCEPopup.onInit.add(function(ed) {
diff --git a/jscripts/tiny_mce/plugins/template/js/template.js b/jscripts/tiny_mce/plugins/template/js/template.js
index bc3045d24..c7c51fde9 100644
--- a/jscripts/tiny_mce/plugins/template/js/template.js
+++ b/jscripts/tiny_mce/plugins/template/js/template.js
@@ -5,7 +5,7 @@ var TemplateDialog = {
 		var url = tinyMCEPopup.getParam("template_external_list_url");
 
 		if (url != null)
-			document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></sc'+'ript>');
+			document.write('<sc'+'ript type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></sc'+'ript>');
 	},
 
 	init : function() {
diff --git a/jscripts/tiny_mce/themes/advanced/js/image.js b/jscripts/tiny_mce/themes/advanced/js/image.js
index bb09e75bf..748a17e57 100644
--- a/jscripts/tiny_mce/themes/advanced/js/image.js
+++ b/jscripts/tiny_mce/themes/advanced/js/image.js
@@ -5,7 +5,7 @@ var ImageDialog = {
 		tinyMCEPopup.requireLangPack();
 
 		if (url = tinyMCEPopup.getParam("external_image_list_url"))
-			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+			document.write('<script type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
 	},
 
 	init : function() {
diff --git a/jscripts/tiny_mce/themes/advanced/js/link.js b/jscripts/tiny_mce/themes/advanced/js/link.js
index 8c1d73c50..5c19fbc39 100644
--- a/jscripts/tiny_mce/themes/advanced/js/link.js
+++ b/jscripts/tiny_mce/themes/advanced/js/link.js
@@ -5,7 +5,7 @@ var LinkDialog = {
 		var url;
 
 		if (url = tinyMCEPopup.getParam("external_link_list_url"))
-			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+			document.write('<script type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
 	},
 
 	init : function() {
diff --git a/mods/_core/backups/admin/restore.php b/mods/_core/backups/admin/restore.php
index fc7e4f183..3f53dd962 100644
--- a/mods/_core/backups/admin/restore.php
+++ b/mods/_core/backups/admin/restore.php
@@ -105,7 +105,7 @@
 </div>
 </form>
 <?php $i=0; ?>
-<script language="javascript" type="text/javascript">
+<script  type="text/javascript">
 	
 	function selectAll() {
 		if (document.form.all.checked == true) {
diff --git a/mods/_core/backups/upload.php b/mods/_core/backups/upload.php
index a196f41d5..dfabbd70a 100644
--- a/mods/_core/backups/upload.php
+++ b/mods/_core/backups/upload.php
@@ -46,7 +46,7 @@
 
 
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 function openWindow(page) {
 	newWindow = window.open(page, "progWin", "width=400,height=200,toolbar=no,location=no");
 	newWindow.focus();
diff --git a/mods/_core/courses/html/course_properties.inc.php b/mods/_core/courses/html/course_properties.inc.php
index 62d765977..b7481e9d1 100644
--- a/mods/_core/courses/html/course_properties.inc.php
+++ b/mods/_core/courses/html/course_properties.inc.php
@@ -178,7 +178,7 @@
 $savant->display('admin/courses/edit_course.tmpl.php');
 ?>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 <!--
 function enableNotify() {
 	document.course_form.notify.disabled = false;
diff --git a/mods/_core/editor/edit_content.php b/mods/_core/editor/edit_content.php
index fffb87aa5..560366689 100644
--- a/mods/_core/editor/edit_content.php
+++ b/mods/_core/editor/edit_content.php
@@ -224,7 +224,7 @@
     
                 if(isset($main['tool_file'])) {
                   //  echo '<!-- TODO LAW note problem here with one tool_file variable for multiple tools -->'."\n";
-                    echo '  <script type="text/javascript" language="javascript">'."\n";
+                    echo '  <script type="text/javascript">'."\n";
                     echo '  //<!--'."\n";
                     echo '  ATutor.mods.editor.tool_for = "' . urlencode($main['title']) . '";'."\n";
                     echo '  //-->'."\n";
diff --git a/mods/_core/editor/editor_tabs/edit.inc.php b/mods/_core/editor/editor_tabs/edit.inc.php
index a298426bf..e61a5ac78 100644
--- a/mods/_core/editor/editor_tabs/edit.inc.php
+++ b/mods/_core/editor/editor_tabs/edit.inc.php
@@ -14,7 +14,7 @@
 
 if (!defined('AT_INCLUDE_PATH')) { exit; }
 ?>
-    <script type="text/javascript" language="javascript">
+    <script type="text/javascript">
     //<!--
         ATutor.mods.editor.editor_pref = "<?php if(isset($_SESSION['prefs']['PREF_CONTENT_EDITOR'])) echo $_SESSION['prefs']['PREF_CONTENT_EDITOR'] ?>";
     //-->
@@ -57,7 +57,7 @@
 			$_POST['head'] = $stripslashes($_POST['head']);
 		}
 ?>
-    <script type="text/javascript" language="javascript">
+    <script type="text/javascript">
     //<!--
         ATutor.mods.editor.content_path = "<?php if(isset($content_row['content_path'])) echo $content_row['content_path'] ?>";
         ATutor.mods.editor.content_id = "<?php if(isset($cid)) echo $cid ?>";
diff --git a/mods/_core/editor/editor_tabs/tests.inc.php b/mods/_core/editor/editor_tabs/tests.inc.php
index 6ca0f5ce9..fc01eb3fa 100644
--- a/mods/_core/editor/editor_tabs/tests.inc.php
+++ b/mods/_core/editor/editor_tabs/tests.inc.php
@@ -210,7 +210,7 @@
 	<br />
 <?php }?>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 	function toggleTestSelect(r_id){
 		var row = document.getElementById(r_id);
 		var checkBox = row.cells[0].firstChild;
diff --git a/mods/_core/file_manager/new.php b/mods/_core/file_manager/new.php
index 0671bc872..3ae1960fa 100644
--- a/mods/_core/file_manager/new.php
+++ b/mods/_core/file_manager/new.php
@@ -204,7 +204,7 @@
 	</div>
 	</form>
 
-	<script type="text/javascript" language="javascript">
+	<script type="text/javascript">
 	//<!--
 	function on_load()
 	{
diff --git a/mods/_core/groups/members.php b/mods/_core/groups/members.php
index 920014956..acfea15f9 100644
--- a/mods/_core/groups/members.php
+++ b/mods/_core/groups/members.php
@@ -213,7 +213,7 @@
 </table>
 </form>
 
-<script type="text/javascript" language="javascript">
+<script type="text/javascript">
 // <!--
 function hirow(obj, row) {
 	if (obj.value && obj.value == <?php echo $_GET['gid']; ?>) {
diff --git a/mods/_core/imscp/index.php b/mods/_core/imscp/index.php
index 5b6f1ff69..a01629f0b 100644
--- a/mods/_core/imscp/index.php
+++ b/mods/_core/imscp/index.php
@@ -182,7 +182,7 @@ function print_menu_sections(&$menu, $only_print_content_folder = false, $parent
 </div>
 </form>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 
 var but_src;
 function setClickSource(name) {
diff --git a/mods/_core/languages/language_editor.php b/mods/_core/languages/language_editor.php
index d91651f40..9031c3e61 100644
--- a/mods/_core/languages/language_editor.php
+++ b/mods/_core/languages/language_editor.php
@@ -156,7 +156,7 @@
 </div>
 </form>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 //<!--
 function showtext(obj) {
 	frames['tran'].location.href = "<?php echo AT_BASE_HREF; ?>mods/_core/languages/language_term.php?type=<?php echo $_variables[$_GET['type']].SEP; ?>term=" + obj.value;
diff --git a/mods/_core/languages/translate.php b/mods/_core/languages/translate.php
index e42bbf637..eced10bf1 100644
--- a/mods/_core/languages/translate.php
+++ b/mods/_core/languages/translate.php
@@ -21,7 +21,7 @@
 define('AT_INCLUDE_PATH', '../../../include/');
 ?>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 function openWindow(page) {
 	newWindow = window.open(page, "progWin", "width=400,height=200,toolbar=no,location=no");
 	newWindow.focus();
diff --git a/mods/_core/users/admins/edit.php b/mods/_core/users/admins/edit.php
index 33c69b03a..ba7166367 100644
--- a/mods/_core/users/admins/edit.php
+++ b/mods/_core/users/admins/edit.php
@@ -118,7 +118,7 @@
 
 ?>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 // <!--
 function checkAdmin() {
 	if (document.form.priv_admin.checked == true) {
diff --git a/mods/_standard/assignments/add_assignment.php b/mods/_standard/assignments/add_assignment.php
index 3487005b3..40cc49fff 100644
--- a/mods/_standard/assignments/add_assignment.php
+++ b/mods/_standard/assignments/add_assignment.php
@@ -279,7 +279,7 @@
 
 
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 function disable_dates (state, name) {
 	document.form['day' + name].disabled=state;
 	document.form['month' + name].disabled=state;
diff --git a/mods/_standard/calendar/index.php b/mods/_standard/calendar/index.php
index 68fb6072a..d0762030a 100644
--- a/mods/_standard/calendar/index.php
+++ b/mods/_standard/calendar/index.php
@@ -89,8 +89,8 @@
             ";
         }
     $_custom_head .= 
-    '<script language="javascript" type="text/javascript">' . $global_js_vars . '</script>
-    <script language="javascript" type="text/javascript" src="' . AT_BASE_HREF .
+    '<script type="text/javascript">' . $global_js_vars . '</script>
+    <script type="text/javascript" src="' . AT_BASE_HREF .
      'mods/_standard/calendar/js/index.js"></script>';
     $_custom_css = $_base_path . 'mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.css'; // use a custom stylesheet
     require(AT_INCLUDE_PATH.'header.inc.php');
@@ -254,7 +254,7 @@
     ?>
 </div>
 
-<script language="javascript" type="text/javascript" src="<?php echo AT_BASE_HREF; ?>mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.js">
+<script type="text/javascript" src="<?php echo AT_BASE_HREF; ?>mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.js">
 </script>
 
 <style type='text/css'>
diff --git a/mods/_standard/calendar/index_mystart.php b/mods/_standard/calendar/index_mystart.php
index 262f2ab57..46f5d51e0 100644
--- a/mods/_standard/calendar/index_mystart.php
+++ b/mods/_standard/calendar/index_mystart.php
@@ -90,8 +90,8 @@
             ";
         }
     $_custom_head .= 
-    '<script language="javascript" type="text/javascript">' . $global_js_vars . '</script>
-    <script language="javascript" type="text/javascript" src="' . AT_BASE_HREF .
+    '<script type="text/javascript">' . $global_js_vars . '</script>
+    <script type="text/javascript" src="' . AT_BASE_HREF .
      'mods/_standard/calendar/js/index_mystart.js"></script>';
     $_custom_css = $_base_path . 'mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.css'; // use a custom stylesheet
     require(AT_INCLUDE_PATH.'header.inc.php');
@@ -107,7 +107,7 @@
 ?>
 <!-- Loader wheel to indicate on-going transfer of data -->
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 
     var userid = "<?php echo $_SESSION['member_id']; ?>";
     </script>
@@ -116,7 +116,7 @@
 </div>
 
 
-<script language="javascript" type="text/javascript" src="<?php echo AT_BASE_HREF; ?>mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.js">
+<script type="text/javascript" src="<?php echo AT_BASE_HREF; ?>mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.js">
 </script>
 
 <style type='text/css'>
diff --git a/mods/_standard/calendar/index_public.php b/mods/_standard/calendar/index_public.php
index 553f251dc..149bd5a8c 100644
--- a/mods/_standard/calendar/index_public.php
+++ b/mods/_standard/calendar/index_public.php
@@ -32,8 +32,8 @@
         var cid                     = '" . $_GET['cid'] . "';
     ";
     $_custom_head .= 
-    '<script language="javascript" type="text/javascript">' . $global_js_vars . '</script>
-    <script language="javascript" type="text/javascript" src="' . AT_BASE_HREF .
+    '<script type="text/javascript">' . $global_js_vars . '</script>
+    <script type="text/javascript" src="' . AT_BASE_HREF .
      'mods/_standard/calendar/js/index_public.js"></script>';
 
     //Get member id from request if it is not set then display default message
@@ -165,7 +165,7 @@
 ?>
 <?php $_custom_css = $_base_path . 'mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.css'; // use a custom stylesheet ?>
 
-<script language="javascript" type="text/javascript" 
+<script type="text/javascript" 
     src="<?php echo AT_BASE_HREF; ?>mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.js">
 </script>
 
diff --git a/mods/_standard/chat/display.php b/mods/_standard/chat/display.php
index 80445c5ac..becff49e2 100644
--- a/mods/_standard/chat/display.php
+++ b/mods/_standard/chat/display.php
@@ -42,7 +42,7 @@
 require('include/html/chat_header.inc.php');
 	if ($myPrefs['refresh'] != 'manual') {
 ?>
-	<script language="javascript" type="text/javascript">
+	<script type="text/javascript">
 	<!--
 		setTimeout("reDisplay()", <?php echo $myPrefs['refresh'] * 1000; ?>);
 		function reDisplay() {
@@ -111,7 +111,7 @@ function reDisplay() {
 			   <input type="submit" name="submit" value="'._AT('send').'" class="button" title="'._AT('send').'" onfocus="this.className=\'submit highlight\'" onblur="this.className=\'submit\'" />';
 
 		echo '</form></p>';
-		echo '<script language="javascript"><!--
+		echo '<script type="text/javascript"><!--
 			   function checkForm() {
 				   if (document.f1.message.value == "" || !document.f1.message.value) return false;
 				   return true;
diff --git a/mods/_standard/chat/poster.php b/mods/_standard/chat/poster.php
index 00b073402..2d1d7f4d5 100644
--- a/mods/_standard/chat/poster.php
+++ b/mods/_standard/chat/poster.php
@@ -35,7 +35,7 @@
 	</td>
 </tr>
 </table>
-<script language="javascript" type="text/javascript"><!--
+<script type="text/javascript"><!--
 	function checkForm() {
 		document.f1.message.value = document.f1.tempField.value;
         if (document.f1.message.value == "" || !document.f1.message.value) return false;
diff --git a/mods/_standard/gradebook/gradebook_add_tests.php b/mods/_standard/gradebook/gradebook_add_tests.php
index e40ab33d5..cdfd949f0 100644
--- a/mods/_standard/gradebook/gradebook_add_tests.php
+++ b/mods/_standard/gradebook/gradebook_add_tests.php
@@ -276,7 +276,7 @@ function add_assignment($assignment_id)
 </div>
 </form>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 function disable_dates (state, name) {
 	document.form['day' + name].disabled=state;
 	document.form['month' + name].disabled=state;
diff --git a/mods/_standard/gradebook/gradebook_edit_tests.php b/mods/_standard/gradebook/gradebook_edit_tests.php
index 554a83c99..e3f38bd61 100644
--- a/mods/_standard/gradebook/gradebook_edit_tests.php
+++ b/mods/_standard/gradebook/gradebook_edit_tests.php
@@ -191,7 +191,7 @@
 </div>
 </form>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 function disable_dates (state, name) {
 	document.form['day' + name].disabled=state;
 	document.form['month' + name].disabled=state;
diff --git a/mods/_standard/tests/html/tests_questions.inc.php b/mods/_standard/tests/html/tests_questions.inc.php
index 56ad6f649..f7c6ea819 100644
--- a/mods/_standard/tests/html/tests_questions.inc.php
+++ b/mods/_standard/tests/html/tests_questions.inc.php
@@ -149,7 +149,7 @@
 </table>
 </form>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 // <!--
 	function selectCat(catID, cat) {
 		for (var i=0;i<document.form.elements.length;i++) {
diff --git a/mods/_standard/tests/lib/test_result_functions.inc.php b/mods/_standard/tests/lib/test_result_functions.inc.php
index 0e13384cb..491aa9918 100644
--- a/mods/_standard/tests/lib/test_result_functions.inc.php
+++ b/mods/_standard/tests/lib/test_result_functions.inc.php
@@ -180,7 +180,7 @@ function print_question_cats($cat_id = 0) {
 
 function print_VE ($area) {
 ?>
-    <script type="text/javascript" language="javascript">
+    <script type="text/javascript">
         document.writeln('<a href="#" onclick="javascript:window.open(\'<?php echo AT_BASE_HREF; ?>mods/_standard/tests/form_editor.php?area=<?php echo $area; ?>\',\'newWin1\',\'toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,copyhistory=0,width=640,height=480\'); return false;" style="cursor: pointer; text-decoration: none" ><?php echo _AT('use_visual_editor'); ?></a>');
     </script>
 
diff --git a/mods/_standard/tile_search/import.php b/mods/_standard/tile_search/import.php
index ebb20d067..b47c88053 100644
--- a/mods/_standard/tile_search/import.php
+++ b/mods/_standard/tile_search/import.php
@@ -152,7 +152,7 @@ function print_menu_sections(&$menu, $parent_content_id = 0, $depth = 0, $orderi
 </div>
 </form>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 function openWindow(page) {
 	newWindow = window.open(page, "progWin", "width=400,height=200,toolbar=no,location=no");
 	newWindow.focus();
diff --git a/themes/atspaces/include/footer.tmpl.php b/themes/atspaces/include/footer.tmpl.php
index 91ccb1353..5b8486507 100644
--- a/themes/atspaces/include/footer.tmpl.php
+++ b/themes/atspaces/include/footer.tmpl.php
@@ -34,7 +34,7 @@
 	<?php require(AT_INCLUDE_PATH.'html/copyright.inc.php'); ?>
 </div>
 </div> <!-- end page wrapper --> 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 //<!--
     <?php require_once(AT_INCLUDE_PATH.'../jscripts/ATutor_js.php'); ?>
 //-->
diff --git a/themes/atspaces/include/header.tmpl.php b/themes/atspaces/include/header.tmpl.php
index 980dc34b0..3807d3b55 100644
--- a/themes/atspaces/include/header.tmpl.php
+++ b/themes/atspaces/include/header.tmpl.php
@@ -97,7 +97,7 @@
     <script type="text/javascript" src="<?php echo $this->base_href; ?>jscripts/infusion/InfusionAll.js"></script>
     <script type="text/javascript" src="<?php echo $this->base_href; ?>jscripts/infusion/framework/enhancement/js/ProgressiveEnhancement.js"></script>
         
-	<script language="javascript" type="text/javascript">
+	<script type="text/javascript">
 	//<!--
 
 	 jQuery.noConflict(); 
diff --git a/themes/blumin/include/header.tmpl.php b/themes/blumin/include/header.tmpl.php
index daeb8c5fb..52e282f30 100644
--- a/themes/blumin/include/header.tmpl.php
+++ b/themes/blumin/include/header.tmpl.php
@@ -81,7 +81,7 @@
 	<?php endif; ?>
 
 	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-	<script language="javascript" type="text/javascript">
+	<script type="text/javascript">
     //<!--
     jQuery.noConflict();
     //-->
diff --git a/themes/default/admin/system_preferences/config_edit.tmpl.php b/themes/default/admin/system_preferences/config_edit.tmpl.php
index 41442f133..3e4246de2 100644
--- a/themes/default/admin/system_preferences/config_edit.tmpl.php
+++ b/themes/default/admin/system_preferences/config_edit.tmpl.php
@@ -135,9 +135,9 @@
 		<label for="maximum_login_attempt"><?php echo _AT('maximum_login_attempt'); ?></label> (<?php echo _AT('default'); ?>: <?php echo $_config_defaults['max_login']; ?>)<br />
 		<input type="text" size="10" name="max_login" id="maximum_login_attempt" value="<?php if (!empty($_POST['max_login'])) { echo $stripslashes(htmlspecialchars($_POST['max_login'])); } else { echo $_config['max_login']; } ?>"  /> <?php echo _AT('times'); ?>
 	</div>
-	<div class="row">	
-<!-- <div class="adv_toggle" role="toggle"><a href="javascript: return:false;">Advanced</a></div> -->
-<div style="" class="adv_opts" >
+<!-- 	<div class="row">	
+<div class="adv_toggle" role="toggle"><a href="javascript: return:false;">Advanced</a></div>
+<div style="" class="adv_opts" > -->
 	<div class="row">
 	<fieldset>
 		<legend><?php echo _AT('display_name_format'); ?> </legend>
@@ -267,8 +267,8 @@
 	</div>
 	<div class="row">
 	
-		<label for="cache_lif"><?php echo _AT('cache_life'); ?></label> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['cache_life']); ?>)<br />
-		<input type="text" name="cache_life" id="cache" size="8" maxlength="8" value="<?php if (!empty($_POST['cache_life'])) { echo $stripslashes(htmlspecialchars($_POST['cache_life'])); } else { echo $_config['cache_life']; } ?>"  />
+		<label for="cache_life"><?php echo _AT('cache_life'); ?></label> (<?php echo _AT('default'); ?>: <?php echo ($_config_defaults['cache_life']); ?>)<br />
+		<input type="text" name="cache_life" id="cache_life" size="8" maxlength="8" value="<?php if (!empty($_POST['cache_life'])) { echo $stripslashes(htmlspecialchars($_POST['cache_life'])); } else { echo $_config['cache_life']; } ?>"  />
 	</div>
 	<div class="row">
 		<label for="latex_server"><?php echo _AT('latex_server'); ?></label><br />
@@ -367,10 +367,10 @@
 		<?php endif; ?>
 	</fieldset>
 	</div>
-</div> <!--  end Advanced -->
+<!--</div>  end Advanced -->
 	<div class="row buttons">
 			<input type="submit" name="submit" value="<?php echo _AT('save'); ?>" accesskey="s"  />
 		<input type="submit" name="cancel" value="<?php echo _AT('cancel'); ?>"  />
 	</div>
 </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/themes/default/editor/edit_content_folder.tmpl.php b/themes/default/editor/edit_content_folder.tmpl.php
index 09d16facd..7bcac87b8 100644
--- a/themes/default/editor/edit_content_folder.tmpl.php
+++ b/themes/default/editor/edit_content_folder.tmpl.php
@@ -94,7 +94,7 @@
 </div>
 </form>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 	function toggleTestSelect(r_id){
 		var row = document.getElementById(r_id);
 		var checkBox = row.cells[0].firstChild;
diff --git a/themes/default/images/editor/edit_content_folder.tmpl.php b/themes/default/images/editor/edit_content_folder.tmpl.php
index ac73f66ca..7fdd4b1b4 100644
--- a/themes/default/images/editor/edit_content_folder.tmpl.php
+++ b/themes/default/images/editor/edit_content_folder.tmpl.php
@@ -94,7 +94,7 @@
 </div>
 </form>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 	function toggleTestSelect(r_id){
 		var row = document.getElementById(r_id);
 		var checkBox = row.cells[0].firstChild;
diff --git a/themes/default/include/fm_header.tmpl.php b/themes/default/include/fm_header.tmpl.php
index 11c307b0c..2069135bf 100644
--- a/themes/default/include/fm_header.tmpl.php
+++ b/themes/default/include/fm_header.tmpl.php
@@ -26,7 +26,7 @@
 	<base href="<?php echo $this->content_base_href; ?>" />
 	<link rel="shortcut icon" href="<?php echo $this->base_path; ?>favicon.ico" type="image/x-icon" />
     <script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>    
-    <script language="javascript" type="text/javascript">
+    <script type="text/javascript">
     //<!--
     jQuery.noConflict();
     //-->
diff --git a/themes/default/include/footer.tmpl.php b/themes/default/include/footer.tmpl.php
index 08f2d49a1..c0f443dbd 100644
--- a/themes/default/include/footer.tmpl.php
+++ b/themes/default/include/footer.tmpl.php
@@ -30,7 +30,7 @@
 <div id="footer">
 	<?php require(AT_INCLUDE_PATH.'html/languages.inc.php'); ?>
 	<?php require(AT_INCLUDE_PATH.'html/copyright.inc.php'); ?>
-    <script language="javascript" type="text/javascript">
+    <script type="text/javascript">
     //<!--
         <?php require_once(AT_INCLUDE_PATH.'../jscripts/ATutor_js.php'); ?>
     //-->
diff --git a/themes/default/include/tm_header.tmpl.php b/themes/default/include/tm_header.tmpl.php
index 65b9a5c12..b344cf718 100644
--- a/themes/default/include/tm_header.tmpl.php
+++ b/themes/default/include/tm_header.tmpl.php
@@ -27,7 +27,7 @@
 	<base href="<?php echo $this->content_base_href;?>" />
 	<link rel="shortcut icon" href="<?php echo $this->base_path; ?>favicon.ico" type="image/x-icon" />
     <script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>    
-    <script language="javascript" type="text/javascript">
+    <script type="text/javascript">
     //<!--
     jQuery.noConflict();
     //-->
diff --git a/themes/default/instructor/backups/restore.tmpl.php b/themes/default/instructor/backups/restore.tmpl.php
index e03efd042..6092a2ae0 100644
--- a/themes/default/instructor/backups/restore.tmpl.php
+++ b/themes/default/instructor/backups/restore.tmpl.php
@@ -38,7 +38,7 @@
 </div>
 </form>
 <?php $i=0; ?>
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 	
 	function selectAll() {
 		if (document.form.all.checked == true) {
diff --git a/themes/default/social/oauth/header.tmpl.php b/themes/default/social/oauth/header.tmpl.php
index 3aa0f384f..8ad3bb251 100644
--- a/themes/default/social/oauth/header.tmpl.php
+++ b/themes/default/social/oauth/header.tmpl.php
@@ -22,7 +22,7 @@
 	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
     <script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
     <script src="<?php echo $this->base_path; ?>jscripts/jquery-ui-1.7.2/development-bundle/ui/ui.resizable.js" type="text/javascript"></script>
-	<script language="javascript" type="text/javascript">
+	<script type="text/javascript">
 	//<!--
 	jQuery.noConflict();
 	//-->
diff --git a/themes/default15/include/fm_header.tmpl.php b/themes/default15/include/fm_header.tmpl.php
index 9a53c2bc0..1bb7d798e 100644
--- a/themes/default15/include/fm_header.tmpl.php
+++ b/themes/default15/include/fm_header.tmpl.php
@@ -26,7 +26,7 @@
 	<base href="<?php echo $this->content_base_href; ?>" />
 	<link rel="shortcut icon" href="<?php echo $this->base_path; ?>favicon.ico" type="image/x-icon" />
     <script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>    
-    <script language="javascript" type="text/javascript">
+    <script type="text/javascript">
     //<!--
     jQuery.noConflict();
     //-->
diff --git a/themes/default20/images/editor/edit_content_folder.tmpl.php b/themes/default20/images/editor/edit_content_folder.tmpl.php
index ac73f66ca..7fdd4b1b4 100644
--- a/themes/default20/images/editor/edit_content_folder.tmpl.php
+++ b/themes/default20/images/editor/edit_content_folder.tmpl.php
@@ -94,7 +94,7 @@
 </div>
 </form>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 	function toggleTestSelect(r_id){
 		var row = document.getElementById(r_id);
 		var checkBox = row.cells[0].firstChild;
diff --git a/themes/default21/include/footer.tmpl.php b/themes/default21/include/footer.tmpl.php
index 08f2d49a1..c0f443dbd 100644
--- a/themes/default21/include/footer.tmpl.php
+++ b/themes/default21/include/footer.tmpl.php
@@ -30,7 +30,7 @@
 <div id="footer">
 	<?php require(AT_INCLUDE_PATH.'html/languages.inc.php'); ?>
 	<?php require(AT_INCLUDE_PATH.'html/copyright.inc.php'); ?>
-    <script language="javascript" type="text/javascript">
+    <script type="text/javascript">
     //<!--
         <?php require_once(AT_INCLUDE_PATH.'../jscripts/ATutor_js.php'); ?>
     //-->
diff --git a/themes/default21/include/header.tmpl.php b/themes/default21/include/header.tmpl.php
index b63f9372c..16dc50e42 100644
--- a/themes/default21/include/header.tmpl.php
+++ b/themes/default21/include/header.tmpl.php
@@ -377,7 +377,8 @@
 				<img  alt="<?php echo _AT('back_to').' '.htmlentities_utf8($this->back_to_page['title']); ?>" title="<?php echo _AT('back_to').' '.htmlentities_utf8($this->back_to_page['title']); ?>" src="<?php echo $this->base_href; ?>images/goback.png" style="float:left;" class="imggoback"/></a>&nbsp;
 			<?php endif; ?>
 			</div>
-
+			<span id="subnav-hide" title="<?php echo _AT('sub_nav_hidden'); ?>" aria-live="polite"></span>
+			<span id="subnav-open" title="<?php echo _AT('sub_nav_opened'); ?>" aria-live="polite"></span>
 			<ul id="subnavlist" role="navigation"  aria-label="<?php echo _AT('tools'); ?>">
 			<?php 
 
@@ -392,8 +393,6 @@
 				
 				<?php } else if($num_pages > 1) { ?>
 					  <li>
-					  <span id="subnav-hide" title="<?php echo _AT('sub_nav_hidden'); ?>" aria-live="polite"></span>
-					  <span id="subnav-open" title="<?php echo _AT('sub_nav_opened'); ?>" aria-live="polite"></span>
 					  <a href="<?php echo $this->sub_level_pages[$i]['url']; ?>"><?php echo stripslashes(htmlentities_utf8($this->sub_level_pages[$i]['title'])); ?></a></li>
 				<?php } ?>
 				<?php if ($i < $num_pages-1): 
diff --git a/themes/default21/styles.css b/themes/default21/styles.css
index f88c9757c..a39aab0ed 100644
--- a/themes/default21/styles.css
+++ b/themes/default21/styles.css
@@ -1548,6 +1548,7 @@ overflow:auto;
 	width: 100%;
 	text-align: center;
 	padding: 0px 0px;
+	margin-top:1em;
 }
 
 /** forum stuff **/
@@ -1595,6 +1596,7 @@ ul#topnavlist li {
 	height:auto;
 	border-radius: .5em .5em 0em 0em;
 	-moz-border-radius: .5em .5em 0em 0em;
+	margin-top:.5em;
 
 
 }
@@ -1922,7 +1924,7 @@ div.home_box {
 	cursor: move;
 }
 div#subnavlistcontainer {
-	width:90%;
+	width:100%;
 	margin:auto;
 	height:1.8em;
 
diff --git a/themes/default_classic/include/footer.tmpl.php b/themes/default_classic/include/footer.tmpl.php
index 08f2d49a1..c0f443dbd 100644
--- a/themes/default_classic/include/footer.tmpl.php
+++ b/themes/default_classic/include/footer.tmpl.php
@@ -30,7 +30,7 @@
 <div id="footer">
 	<?php require(AT_INCLUDE_PATH.'html/languages.inc.php'); ?>
 	<?php require(AT_INCLUDE_PATH.'html/copyright.inc.php'); ?>
-    <script language="javascript" type="text/javascript">
+    <script type="text/javascript">
     //<!--
         <?php require_once(AT_INCLUDE_PATH.'../jscripts/ATutor_js.php'); ?>
     //-->
diff --git a/themes/fluid/include/header.tmpl.php b/themes/fluid/include/header.tmpl.php
index ad43f4de2..48a68111b 100644
--- a/themes/fluid/include/header.tmpl.php
+++ b/themes/fluid/include/header.tmpl.php
@@ -84,7 +84,7 @@
 	<link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 1.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-1" />
 	<?php endif; ?>
 	<script type="text/javascript" src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js"></script>
-    <script language="javascript" type="text/javascript">
+    <script type="text/javascript">
     //<!--
     jQuery.noConflict();
     //-->
@@ -97,7 +97,7 @@
 
 <body onload="<?php echo $this->onload; ?>">
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 //<!--
 jQuery(document).ready(function () {
 	// only specific list items are sortable
diff --git a/themes/greenmin/include/header.tmpl.php b/themes/greenmin/include/header.tmpl.php
index 533ac71b8..ac38778d1 100644
--- a/themes/greenmin/include/header.tmpl.php
+++ b/themes/greenmin/include/header.tmpl.php
@@ -80,7 +80,7 @@
 	<link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 1.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-1" />
 	<?php endif; ?>
 	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-    <script language="javascript" type="text/javascript">
+    <script type="text/javascript">
     //<!--
     jQuery.noConflict();
     //-->
diff --git a/themes/idi/include/header.tmpl.php b/themes/idi/include/header.tmpl.php
index 22b941e54..a66b06d1e 100644
--- a/themes/idi/include/header.tmpl.php
+++ b/themes/idi/include/header.tmpl.php
@@ -81,7 +81,7 @@
 	<?php endif; ?>
 
 	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-	<script language="javascript" type="text/javascript">
+	<script type="text/javascript">
     //<!--
     jQuery.noConflict();
     //-->
diff --git a/themes/mobile/editor/edit_content_folder.tmpl.php b/themes/mobile/editor/edit_content_folder.tmpl.php
index d92732ef7..7b0a19d75 100644
--- a/themes/mobile/editor/edit_content_folder.tmpl.php
+++ b/themes/mobile/editor/edit_content_folder.tmpl.php
@@ -96,7 +96,7 @@
 </div>
 </form>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 	function toggleTestSelect(r_id){
 		var row = document.getElementById(r_id);
 		var checkBox = row.cells[0].firstChild;
diff --git a/themes/mobile/include/footer.tmpl.php b/themes/mobile/include/footer.tmpl.php
index 048994c79..fb0db8382 100644
--- a/themes/mobile/include/footer.tmpl.php
+++ b/themes/mobile/include/footer.tmpl.php
@@ -39,7 +39,7 @@
  </div>			
 </div>
 
-	<script language="javascript" type="text/javascript">
+	<script type="text/javascript">
 //<!--
     <?php require_once(AT_INCLUDE_PATH.'../jscripts/ATutor_js.php'); ?>
 //-->
@@ -84,7 +84,7 @@
 </ul>			
  </div>			
 </div>
-	<script language="javascript" type="text/javascript">
+	<script  type="text/javascript">
 //<!--
     <?php require_once(AT_INCLUDE_PATH.'../jscripts/ATutor_js.php'); ?>
 //-->
diff --git a/themes/mobile/include/header.tmpl.php b/themes/mobile/include/header.tmpl.php
index 856b75e64..65d8e4ce0 100644
--- a/themes/mobile/include/header.tmpl.php
+++ b/themes/mobile/include/header.tmpl.php
@@ -114,7 +114,7 @@
 	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/moz.css" type="text/css" />-->	
 	<!-- Fluid Infusion -->
 	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-	<script language="javascript" type="text/javascript">
+	<script type="text/javascript">
 
 	//<!--
 	jQuery.noConflict();
@@ -294,7 +294,7 @@
 					
 		<div id="content">
 			<?php $contentManager->printMainMenu(); ?>
-				<script language="javascript" type="text/javascript"></script>
+				<script type="text/javascript"></script>
 		</div>
 
 	</div>
@@ -451,7 +451,7 @@
 			</div>	
 				<div id="content">
 					<?php $contentManager->printMainMenu(); ?>
-					<script language="javascript" type="text/javascript"></script>
+					<script type="text/javascript"></script>
 				</div>
 		</div><!-- course-level navigation -->				
 		</div> <!-- end sequence-links-course-navigation -->
diff --git a/themes/mobile/social/oauth/header.tmpl.php b/themes/mobile/social/oauth/header.tmpl.php
index 3aa0f384f..8ad3bb251 100644
--- a/themes/mobile/social/oauth/header.tmpl.php
+++ b/themes/mobile/social/oauth/header.tmpl.php
@@ -22,7 +22,7 @@
 	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
     <script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
     <script src="<?php echo $this->base_path; ?>jscripts/jquery-ui-1.7.2/development-bundle/ui/ui.resizable.js" type="text/javascript"></script>
-	<script language="javascript" type="text/javascript">
+	<script type="text/javascript">
 	//<!--
 	jQuery.noConflict();
 	//-->
diff --git a/themes/mobile/test.html b/themes/mobile/test.html
deleted file mode 100644
index f91ff9714..000000000
--- a/themes/mobile/test.html
+++ /dev/null
@@ -1,109 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="<?php echo $this->lang_code; ?>"> 
-
-<head>
-	<title><?php echo SITE_NAME; ?> : <?php echo $this->page_title; ?></title>
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $this->lang_charset; ?>" />
-	<meta name="Generator" content="ATutor - Copyright 2005 by http://atutor.ca" />
-	<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0," />
-	<meta name="apple-mobile-web-app-capable" content="yes"/>
-	<base href="<?php echo $this->content_base_href; ?>" />
-	<link rel="shortcut icon" href="<?php echo $this->base_path; ?>favicon.ico" type="image/x-icon" /> 
-	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/print.css" type="text/css" media="print" />
-	<!-- mobile FSS -->
-	<link rel="stylesheet" href="<?php echo $this->base_path; ?>jscripts/infusion/framework/fss/css/fss-mobile-layout.css" type="text/css"/>
-	<link rel="stylesheet" href="<?php echo $this->base_path; ?>jscripts/infusion/framework/fss/css/fss-mobile-theme-iphone.css" type="text/css"/>	
-	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/styles.css" type="text/css"/>
-
-	
-	<!--[if IE]>
-	  <link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/ie_styles.css" type="text/css" />
-	<![endif]-->
-	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/forms.css" type="text/css" />
-		
-<?php echo $this->rtl_css; ?>
-<?php if (isset($this->course_id) && $system_courses[$this->course_id]['rss']): ?>
-	<link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 2.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-2" />
-	<link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 1.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-1" />
-<?php endif; ?>
-	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-	<script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
-	<script src="<?php echo $this->base_path; ?>jscripts/ATutor.js" type="text/javascript"></script>   
-	<script src="<?php echo $this->base_path; ?>jscripts/ATutorCourse.js" type="text/javascript"></script>   
-	<script src="<?php echo $this->base_path.'themes/'.$this->theme; ?>/iscroll.js" type="text/javascript"></script>
-	<script language="javascript" type="text/javascript">
-	//<!--
-	jQuery.noConflict();
-	//-->
-	</script>
-<script type="text/javascript">
-var myScroll;
-
-function setHeight() {
-	var headerH = document.getElementById('header').offsetHeight;
-	var footerH = document.getElementById('footer').offsetHeight;
-	var wrapperH = window.innerHeight - headerH - footerH;
-	document.getElementById('wrapper').style.height = wrapperH + 'px';
-}
-
-function loaded() {
-	setHeight();
-	myScroll = new iScroll('scroller', { checkDOMChanges: true, fadeScrollbar: false, vScrollbar: true, bounce: false, desktopCompatibility: true });
-}
-
-window.addEventListener('onorientationchange' in window ? 'orientationchange' : 'resize', setHeight, false); //destroy on horizontal? 
-document.addEventListener('touchmove', function(e){ e.preventDefault(); }, false);
-document.addEventListener('DOMContentLoaded', loaded, false);
-</script>
-
-
-<?php echo $this->custom_css; ?>
-</head>
-
-<body>
-<div id="header"><a href="http://cubiq.org/iscroll">iScroll</a></div>
-
-<div id="wrapper">
-	<div id="scroller">
-		<ul id="thelist">
-			<li>Pretty content row 1</li>
-			<li>Pretty content row 2</li>
-
-			<li>Pretty content row 3</li>
-			<li>Pretty content row 4</li>
-			<li>Pretty content row 5</li>
-			<li>Pretty content row 1</li>
-			<li>Pretty content row 2</li>
-
-			<li>Pretty content row 3</li>
-			<li>Pretty content row 4</li>
-			<li>Pretty content row 5</li>
-			<li>Pretty content row 1</li>
-			<li>Pretty content row 2</li>
-
-			<li>Pretty content row 3</li>
-			<li>Pretty content row 4</li>
-			<li>Pretty content row 5</li>
-			<li>Pretty content row 1</li>
-			<li>Pretty content row 2</li>
-
-			<li>Pretty content row 3</li>
-			<li>Pretty content row 4</li>
-			<li>Pretty content row 5</li>
-			<li>Pretty content row 1</li>
-			<li>Pretty content row 2</li>
-
-			<li>Pretty content row 3</li>
-			<li>Pretty content row 4</li>
-			<li>Pretty content row 5</li>
-
-		</ul>
-	</div>
-</div>
-
-<div id="footer"></div>
-<div id="test"><div></div></div>
-</body>
-</html>
\ No newline at end of file
diff --git a/themes/simplified_desktop/include/footer.tmpl.php b/themes/simplified_desktop/include/footer.tmpl.php
index 2dbb2da3a..4b0f470b9 100644
--- a/themes/simplified_desktop/include/footer.tmpl.php
+++ b/themes/simplified_desktop/include/footer.tmpl.php
@@ -39,7 +39,7 @@
  </div>			
 </div>
 
-	<script language="javascript" type="text/javascript">
+	<script type="text/javascript">
 //<!--
     <?php require_once(AT_INCLUDE_PATH.'../jscripts/ATutor_js.php'); ?>
 //-->
@@ -84,7 +84,7 @@
 </ul>			
  </div>			
 </div>
-	<script language="javascript" type="text/javascript">
+	<script type="text/javascript">
 //<!--
     <?php require_once(AT_INCLUDE_PATH.'../jscripts/ATutor_js.php'); ?>
 //-->
diff --git a/themes/simplified_desktop/include/header.tmpl.php b/themes/simplified_desktop/include/header.tmpl.php
index b9426e677..06e1810b3 100644
--- a/themes/simplified_desktop/include/header.tmpl.php
+++ b/themes/simplified_desktop/include/header.tmpl.php
@@ -98,7 +98,7 @@
 	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/moz.css" type="text/css" />-->	
 	<!-- Fluid Infusion -->
 	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-	<script language="javascript" type="text/javascript">
+	<script type="text/javascript">
 
 	//<!--
 	jQuery.noConflict();
@@ -205,7 +205,7 @@
 			</div>	
 			<div id="content">
 				<?php $contentManager->printMainMenu(); ?>
-				<script language="javascript" type="text/javascript"></script>
+				<script type="text/javascript"></script>
 			</div>
 		</div><!-- course-level navigation -->				
 	</div> <!-- end sequence-links-course-navigation -->
@@ -301,7 +301,7 @@
 					
 	<!--	<div id="content">
 			<?php $contentManager->printMainMenu(); ?>
-				<script language="javascript" type="text/javascript"></script>
+				<script type="text/javascript"></script>
 		</div> -->
 
 	</div>
diff --git a/themes/simplified_desktop/social/oauth/header.tmpl.php b/themes/simplified_desktop/social/oauth/header.tmpl.php
index 3aa0f384f..8ad3bb251 100644
--- a/themes/simplified_desktop/social/oauth/header.tmpl.php
+++ b/themes/simplified_desktop/social/oauth/header.tmpl.php
@@ -22,7 +22,7 @@
 	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
     <script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
     <script src="<?php echo $this->base_path; ?>jscripts/jquery-ui-1.7.2/development-bundle/ui/ui.resizable.js" type="text/javascript"></script>
-	<script language="javascript" type="text/javascript">
+	<script type="text/javascript">
 	//<!--
 	jQuery.noConflict();
 	//-->
diff --git a/themes/simplified_desktop/test.html b/themes/simplified_desktop/test.html
deleted file mode 100644
index f91ff9714..000000000
--- a/themes/simplified_desktop/test.html
+++ /dev/null
@@ -1,109 +0,0 @@
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="<?php echo $this->lang_code; ?>"> 
-
-<head>
-	<title><?php echo SITE_NAME; ?> : <?php echo $this->page_title; ?></title>
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $this->lang_charset; ?>" />
-	<meta name="Generator" content="ATutor - Copyright 2005 by http://atutor.ca" />
-	<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0," />
-	<meta name="apple-mobile-web-app-capable" content="yes"/>
-	<base href="<?php echo $this->content_base_href; ?>" />
-	<link rel="shortcut icon" href="<?php echo $this->base_path; ?>favicon.ico" type="image/x-icon" /> 
-	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/print.css" type="text/css" media="print" />
-	<!-- mobile FSS -->
-	<link rel="stylesheet" href="<?php echo $this->base_path; ?>jscripts/infusion/framework/fss/css/fss-mobile-layout.css" type="text/css"/>
-	<link rel="stylesheet" href="<?php echo $this->base_path; ?>jscripts/infusion/framework/fss/css/fss-mobile-theme-iphone.css" type="text/css"/>	
-	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/styles.css" type="text/css"/>
-
-	
-	<!--[if IE]>
-	  <link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/ie_styles.css" type="text/css" />
-	<![endif]-->
-	<link rel="stylesheet" href="<?php echo $this->base_path.'themes/'.$this->theme; ?>/forms.css" type="text/css" />
-		
-<?php echo $this->rtl_css; ?>
-<?php if (isset($this->course_id) && $system_courses[$this->course_id]['rss']): ?>
-	<link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 2.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-2" />
-	<link rel="alternate" type="application/rss+xml" title="<?php echo SITE_NAME; ?> - RSS 1.0" href="<?php echo $this->base_href; ?>get_rss.php?<?php echo $this->course_id; ?>-1" />
-<?php endif; ?>
-	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-	<script src="<?php echo $this->base_path; ?>jscripts/infusion/jquery.autoHeight.js" type="text/javascript"></script>
-	<script src="<?php echo $this->base_path; ?>jscripts/ATutor.js" type="text/javascript"></script>   
-	<script src="<?php echo $this->base_path; ?>jscripts/ATutorCourse.js" type="text/javascript"></script>   
-	<script src="<?php echo $this->base_path.'themes/'.$this->theme; ?>/iscroll.js" type="text/javascript"></script>
-	<script language="javascript" type="text/javascript">
-	//<!--
-	jQuery.noConflict();
-	//-->
-	</script>
-<script type="text/javascript">
-var myScroll;
-
-function setHeight() {
-	var headerH = document.getElementById('header').offsetHeight;
-	var footerH = document.getElementById('footer').offsetHeight;
-	var wrapperH = window.innerHeight - headerH - footerH;
-	document.getElementById('wrapper').style.height = wrapperH + 'px';
-}
-
-function loaded() {
-	setHeight();
-	myScroll = new iScroll('scroller', { checkDOMChanges: true, fadeScrollbar: false, vScrollbar: true, bounce: false, desktopCompatibility: true });
-}
-
-window.addEventListener('onorientationchange' in window ? 'orientationchange' : 'resize', setHeight, false); //destroy on horizontal? 
-document.addEventListener('touchmove', function(e){ e.preventDefault(); }, false);
-document.addEventListener('DOMContentLoaded', loaded, false);
-</script>
-
-
-<?php echo $this->custom_css; ?>
-</head>
-
-<body>
-<div id="header"><a href="http://cubiq.org/iscroll">iScroll</a></div>
-
-<div id="wrapper">
-	<div id="scroller">
-		<ul id="thelist">
-			<li>Pretty content row 1</li>
-			<li>Pretty content row 2</li>
-
-			<li>Pretty content row 3</li>
-			<li>Pretty content row 4</li>
-			<li>Pretty content row 5</li>
-			<li>Pretty content row 1</li>
-			<li>Pretty content row 2</li>
-
-			<li>Pretty content row 3</li>
-			<li>Pretty content row 4</li>
-			<li>Pretty content row 5</li>
-			<li>Pretty content row 1</li>
-			<li>Pretty content row 2</li>
-
-			<li>Pretty content row 3</li>
-			<li>Pretty content row 4</li>
-			<li>Pretty content row 5</li>
-			<li>Pretty content row 1</li>
-			<li>Pretty content row 2</li>
-
-			<li>Pretty content row 3</li>
-			<li>Pretty content row 4</li>
-			<li>Pretty content row 5</li>
-			<li>Pretty content row 1</li>
-			<li>Pretty content row 2</li>
-
-			<li>Pretty content row 3</li>
-			<li>Pretty content row 4</li>
-			<li>Pretty content row 5</li>
-
-		</ul>
-	</div>
-</div>
-
-<div id="footer"></div>
-<div id="test"><div></div></div>
-</body>
-</html>
\ No newline at end of file
diff --git a/themes/tablet1/include/footer.tmpl.php b/themes/tablet1/include/footer.tmpl.php
index b87439741..54907c6a0 100644
--- a/themes/tablet1/include/footer.tmpl.php
+++ b/themes/tablet1/include/footer.tmpl.php
@@ -34,7 +34,7 @@
 	<?php require(AT_INCLUDE_PATH.'html/copyright.inc.php'); ?>
 </div>
 </div> <!-- end page wrapper --> 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 //<!--
     <?php require_once(AT_INCLUDE_PATH.'../jscripts/ATutor_js.php'); ?>
 //-->
diff --git a/themes/tablet1/include/header.tmpl.php b/themes/tablet1/include/header.tmpl.php
index d283c7614..d3ed58f5c 100644
--- a/themes/tablet1/include/header.tmpl.php
+++ b/themes/tablet1/include/header.tmpl.php
@@ -78,7 +78,7 @@
 	<script src="http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.js"></script>
 	<script src="http://code.jquery.com/jquery-1.6.1.min.js"></script>
 	<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-	<script language="javascript" type="text/javascript">
+	<script type="text/javascript">
 	//<!--
 	jQuery.noConflict();
 	//-->
diff --git a/tools/prog.php b/tools/prog.php
index eea09d1c1..36cc9a316 100644
--- a/tools/prog.php
+++ b/tools/prog.php
@@ -32,7 +32,7 @@
 	<?php } ?>
 	<meta http-equiv="Content-Type" content="text/html; <?php echo $myLang->getCharacterSet(); ?>" />
     <script src="<?php echo $_base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-    <script language="javascript" type="text/javascript">
+    <script type="text/javascript">
     //<!--
     jQuery.noConflict();
     //-->
diff --git a/users/prog_unused.php b/users/prog_unused.php
index 1d93e250a..92ea2d89b 100644
--- a/users/prog_unused.php
+++ b/users/prog_unused.php
@@ -26,7 +26,7 @@
 	<?php } ?>
 	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
     <script src="<?php echo $_base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
-    <script language="javascript" type="text/javascript">
+    <script type="text/javascript">
     //<!--
     jQuery.noConflict();
     //-->
diff --git a/users/tool_settings.inc.php b/users/tool_settings.inc.php
index 470070f5f..b1ad3ef12 100644
--- a/users/tool_settings.inc.php
+++ b/users/tool_settings.inc.php
@@ -78,7 +78,7 @@
 		<input id="abac" name="abacus" type="checkbox" <?php echo $abac; ?> onchange="changeVal('abac')" /><label for="abac"><?php echo _AT("abacus"); ?></label><br />
 	</div>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 //<!--
 function changeVal(val_name)
 {
