diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index fe8a7e4d3..1062b7c9d 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -416,7 +416,7 @@ sub _drawQueryBuilder {
 	
 	# html
 	my $output;
-	$output .= '<script type="text/javascript" language="javascript" src="'.
+	$output .= '<script type="text/javascript" src="'.
 		$session{config}{extrasURL}.'/wobject/Shortcut/querybuilder.js"></script>';
 	$output .= '<link href="'.$session{config}{extrasURL}.
 			'/wobject/Shortcut/querybuilder.css" type="text/css" rel="stylesheet">';
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index bb37afcd1..7bdc04ae4 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -119,7 +119,7 @@ sub _tonull {
 sub _createTabInit {
 	my $id = shift;
 	my @tabCount = WebGUI::SQL->quickArray("select count(DataForm_tabId) from DataForm_tab where assetId=".quote($id));
-	my $output = '<script type="text/javascript" language="javascript"> var numberOfTabs = '.$tabCount[0].'; initTabs();</script>';
+	my $output = '<script type="text/javascript">var numberOfTabs = '.$tabCount[0].'; initTabs();</script>';
 	return $output;
 }
 
@@ -683,7 +683,7 @@ sub viewForm {
 	my $self = shift;
 	my $passedVars = shift;
 	WebGUI::Style::setLink($session{config}{extrasURL}.'/tabs/tabs.css', {"type"=>"text/css"});
-	WebGUI::Style::setScript($session{config}{extrasURL}.'/tabs/tabs.js', {"language"=>"JavaScript"});
+	WebGUI::Style::setScript($session{config}{extrasURL}.'/tabs/tabs.js', {"type"=>"text/javascript"});
 	my $var;
 	$var->{entryId} = $session{form}{entryId} if ($self->canEdit);
 	$var = $passedVars || $self->getRecordTemplateVars($var);
diff --git a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
index 62dff69ce..f1dc349d5 100644
--- a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
+++ b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm
@@ -186,10 +186,10 @@ sub getEditForm {
 
 	# Color picker for highlight colors
 	$tabform->getTab("display")->raw 	(	-value=>'
-				<SCRIPT LANGUAGE="Javascript" SRC="'.$session{config}{extrasURL}.'/wobject/IndexedSearch/ColorPicker2.js"></SCRIPT>
-				<SCRIPT LANGUAGE="JavaScript">
+				<script type="text/javascript" src="'.$session{config}{extrasURL}.'/wobject/IndexedSearch/ColorPicker2.js"></script>
+				<script type="text/javascript">
 				var cp = new ColorPicker("window");
-				</SCRIPT>'
+				</script>'
 			);
 	for (1..5) {
 		my $highlight = "highlight_$_";
diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm
index 3a8718795..ac0b72bb1 100644
--- a/lib/WebGUI/Asset/Wobject/Layout.pm
+++ b/lib/WebGUI/Asset/Wobject/Layout.pm
@@ -187,15 +187,15 @@ sub view {
 	if ($vars{showAdmin}) {
 		# under normal circumstances we don't put HTML stuff in our code, but this will make it much easier
 		# for end users to work with our templates
-		WebGUI::Style::setScript($session{config}{extrasURL}."/draggable.js",{ type=>"text/javascript", language=>"javascript"	});
+		WebGUI::Style::setScript($session{config}{extrasURL}."/draggable.js",{ type=>"text/javascript" });
 		WebGUI::Style::setLink($session{config}{extrasURL}."/draggable.css",{ type=>"text/css", rel=>"stylesheet", media=>"all" });
 		$vars{"dragger.icon"} = WebGUI::Icon::dragIcon();
 		$vars{"dragger.init"} = '
 			<iframe id="dragSubmitter" style="display: none;" src="'.$session{config}{extrasURL}.'/spacer.gif"></iframe>
-			<script>
+			<script type="text/javascript">
 				dragable_init("'.$self->getUrl("func=setContentPositions;map=").'");
 			</script>
-			<style>
+			<style type="text/css">
 			.dragging, .empty {
 				  background-image: url("'.$session{config}{extrasURL}.'/opaque.gif");
 			}
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index 622d04c60..dcde9e5fa 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -216,7 +216,7 @@ sub getEditForm {
                 -value=>$self->getValue("showUnprivilegedPages")
         	);
 	my $start = $self->getValue("startPoint");
-	$tabform->getTab("properties")->raw("<script language=\"javascript\" type=\"text/javascript\">
+	$tabform->getTab("properties")->raw("<script type=\"text/javascript\">
 		var displayNavDescendantEndPoint = true;
 		var displayNavAncestorEndPoint = true;
 		function toggleDescendantEndPoint () {
@@ -288,7 +288,7 @@ sub getToolbar {
 			$toolbar = editIcon('func=edit'.$returnUrl,$self->get("url"));
 		}
 		my $i18n = WebGUI::International->new("Asset");
-		return '<script language="javascript" type="text/javascript">
+		return '<script type="text/javascript">
                 var contextMenu = new contextMenu_createWithImage("'.$self->getIcon(1).'","'.$self->getId.'","'.$self->getName.'");
                 contextMenu.addLink("'.$self->getUrl("func=copy").'","'.$i18n->get("copy").'");
                 contextMenu.addLink("'.$self->getUrl("func=manageAssets").'","'.$i18n->get("manage").'");
diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm
index 7df5e74d9..7814d206b 100644
--- a/lib/WebGUI/Asset/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm
@@ -154,7 +154,7 @@ sub getEditForm {
 
 	# Add toggleQuery javascript
 	$tabform->getTab("properties")->raw(qq|
-		<script language="javascript">
+		<script type="text/javascript">
 		function toggleQuery(Id) {
 			queryClass = "query" + Id;
 			var tr = document.getElementsByTagName("tr");
@@ -215,7 +215,7 @@ sub getEditForm {
 	   # Make empty query blocks invisible
            if ($nr > 1 && ($self->get("dbQuery".$nr) eq "" || $self->get("dbQuery".($nr-1)) eq "")) {
 		$tabform->getTab("properties")->raw(qq|
-                        <script language="javascript">
+                        <script type="text/javascript">
                                 toggleQuery('$nr');
                         </script>
                         |);
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index e6f77998d..0eaa7ae08 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -1008,7 +1008,7 @@ sub www_editQuestion {
                                 editIcon('func=editAnswer;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
                                 moveUpIcon('func=moveAnswerUp'.';qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
                                 moveDownIcon('func=moveAnswerDown;qid='.$question->{Survey_questionId}.';aid='.$data{Survey_answerId}, $self->get("url")).
-                                ' '.$data{answer}.'<br>';
+                                ' '.$data{answer}.'<br />';
 		}
 		$sth->finish;
 	}
diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm
index 7e2b10ae5..0438d4ad1 100644
--- a/lib/WebGUI/AssetBranch.pm
+++ b/lib/WebGUI/AssetBranch.pm
@@ -121,7 +121,7 @@ sub www_editBranch {
 					title=>WebGUI::International::get(99,"Asset"),
 					currentUrl=>"Current URL"
 					}
-				})."<script type=\"text/javascript\" language=\"javascript\">
+				})."<script type=\"text/javascript\">
 			function toggleSpecificBaseUrl () {
 				if (document.getElementById('baseUrlBy').options[document.getElementById('baseUrlBy').selectedIndex].value == 'specifiedBase') {
 					document.getElementById('baseUrl').innerHTML='<input type=\"text\" name=\"baseUrl\" />';
diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm
index 1f6a86b29..0f9eec36c 100644
--- a/lib/WebGUI/AssetClipboard.pm
+++ b/lib/WebGUI/AssetClipboard.pm
@@ -318,7 +318,7 @@ WebGUI::Style::setLink($session{config}{extrasURL}.'/assetManager/assetManager.c
         WebGUI::Style::setScript($session{config}{extrasURL}.'/assetManager/assetManager.js', {type=>"text/javascript"});
         my $i18n = WebGUI::International->new("Asset");
         my $output = "
-   <script type=\"text/javascript\" language=\"javascript\">
+   <script type=\"text/javascript\">
      var assetManager = new AssetManager();
          assetManager.AddColumn('".WebGUI::Form::checkbox({extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form');
          assetManager.AddColumn('".$i18n->get("99")."','','left','');
diff --git a/lib/WebGUI/AssetTrash.pm b/lib/WebGUI/AssetTrash.pm
index f4ee2900a..6412730d6 100644
--- a/lib/WebGUI/AssetTrash.pm
+++ b/lib/WebGUI/AssetTrash.pm
@@ -218,7 +218,7 @@ sub www_manageTrash {
         WebGUI::Style::setScript($session{config}{extrasURL}.'/assetManager/assetManager.js', {type=>"text/javascript"});
         my $i18n = WebGUI::International->new("Asset");
 	my $output = "
-   <script type=\"text/javascript\" language=\"javascript\">
+   <script type=\"text/javascript\">
      var assetManager = new AssetManager();
          assetManager.AddColumn('".WebGUI::Form::checkbox({extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form');
          assetManager.AddColumn('".$i18n->get("99")."','','left','');
diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm
index 657322e3e..b04ffdd1e 100644
--- a/lib/WebGUI/HTMLForm.pm
+++ b/lib/WebGUI/HTMLForm.pm
@@ -167,7 +167,7 @@ Returns the HTML for this form object.
 =cut
 
 sub print {
-        return $_[0]->{_header}.$_[0]->{_data}.$_[0]->{_footer}.'<script language="JavaScript" type="text/javascript" src="'.$session{config}{extrasURL}.'/wz_tooltip.js"></script>';
+        return $_[0]->{_header}.$_[0]->{_data}.$_[0]->{_footer}.'<script type="text/javascript" src="'.$session{config}{extrasURL}.'/wz_tooltip.js"></script>';
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Macro/Spacer.pm b/lib/WebGUI/Macro/Spacer.pm
index 644aea20e..4a252dd0b 100644
--- a/lib/WebGUI/Macro/Spacer.pm
+++ b/lib/WebGUI/Macro/Spacer.pm
@@ -21,7 +21,7 @@ sub process {
         @param = WebGUI::Macro::getParams($_[0]);
         $width = $param[0] if defined $param[0];
         $height = $param[1] if defined $param[1];
-        $output = '<img src="'.$session{config}{extrasURL}.'/spacer.gif"'.(defined $width?' width="'.$width.'"':'').(defined $height?' height="'.$height.'"':'').' border="0">';
+        $output = '<img src="'.$session{config}{extrasURL}.'/spacer.gif"'.(defined $width?' width="'.$width.'"':'').(defined $height?' height="'.$height.'"':'').' border="0" alt="" />';
         return $output;
 }
 
diff --git a/lib/WebGUI/TabForm.pm b/lib/WebGUI/TabForm.pm
index ee5b00fdb..fe1a92130 100644
--- a/lib/WebGUI/TabForm.pm
+++ b/lib/WebGUI/TabForm.pm
@@ -245,7 +245,7 @@ sub print {
 	$output .= $form;
 	$output .= WebGUI::Form::formFooter();
 	$output .= '<script>var numberOfTabs = '.($i-1).'; initTabs();</script>';
-	$output .= '<script language="JavaScript" type="text/javascript" src="'.$session{config}{extrasURL}.'/wz_tooltip.js"></script>';
+	$output .= '<script type="text/javascript" src="'.$session{config}{extrasURL}.'/wz_tooltip.js"></script>';
 	return $output;
 }