diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm
index 98acad518..88ba8c7be 100644
--- a/lib/WebGUI/Operation/Commerce.pm
+++ b/lib/WebGUI/Operation/Commerce.pm
@@ -433,7 +433,7 @@ sub www_editCommerceSettings {
 		
 	# payment plugin
 	if (%paymentPlugins) {
-		$tabform->getTab('payment')->raw('<script language="JavaScript" type="text/javascript"> var activePayment="'.$paymentPlugin.'"; </script>');
+		$tabform->getTab('payment')->raw('<script type="text/javascript"> var activePayment="'.$paymentPlugin.'"; </script>');
 		$tabform->getTab("payment")->selectList(
 			-name		=> 'commercePaymentPlugin',
 			-options	=> \%paymentPlugins,
@@ -442,7 +442,7 @@ sub www_editCommerceSettings {
 			-extras		=> 'onchange="activePayment=operateHidden(this.options[this.selectedIndex].value,activePayment)"'
 			);
 			
-		$jscript = '<script language="JavaScript" type="text/javascript">';
+		$jscript = '<script type="text/javascript">';
 		foreach $currentPlugin (@paymentPlugins) {
 			$tabform->getTab('payment')->raw('<tr id="'.$currentPlugin->namespace.'"><td colspan="2" width="100%">'.
 				'<table border=0 cellspacing=0 cellpadding=0  width="100%">'.
@@ -474,7 +474,7 @@ sub www_editCommerceSettings {
 	
 	# shipping plugin
 	if (%shippingPlugins) {
-		$tabform->getTab('shipping')->raw('<script language="JavaScript" type="text/javascript"> var activeShipping="'.$shippingPlugin.'"; </script>');
+		$tabform->getTab('shipping')->raw('<script type="text/javascript"> var activeShipping="'.$shippingPlugin.'"; </script>');
 		$tabform->getTab('shipping')->selectList(
 			-name	=> 'commerceShippingPlugin',
 			-options=> \%shippingPlugins,
@@ -483,7 +483,7 @@ sub www_editCommerceSettings {
 			-extras	=> 'onchange="activeShipping=operateHidden(this.options[this.selectedIndex].value,activeShipping)"'
 			);
 		
-		$jscript = '<script language="JavaScript" type="text/javascript">';
+		$jscript = '<script type="text/javascript">';
 		foreach $currentPlugin (@shippingPlugins) {
 			$tabform->getTab('shipping')->raw('<tr id="'.$currentPlugin->namespace.'"><td colspan="2" width="100%">'.
 				'<table border=0 cellspacing=0 cellpadding=0  width="100%">'.
@@ -498,7 +498,7 @@ sub www_editCommerceSettings {
 
 	$tabform->submit;
 
-	WebGUI::Style::setScript($session{config}{extrasURL}.'/swapLayers.js',{language=>"Javascript"});
+	WebGUI::Style::setScript($session{config}{extrasURL}.'/swapLayers.js',{type=>"text/javascript"});
 	
 	return _submenu($tabform->print, 'edit commerce settings title', 'commerce manage');
 }
diff --git a/lib/WebGUI/Operation/FormHelpers.pm b/lib/WebGUI/Operation/FormHelpers.pm
index f19cf4e26..69869cc45 100644
--- a/lib/WebGUI/Operation/FormHelpers.pm
+++ b/lib/WebGUI/Operation/FormHelpers.pm
@@ -67,7 +67,7 @@ sub www_richEditPageTree {
 	WebGUI::Style::setScript($session{config}{extrasURL}."/tinymce/jscripts/tiny_mce/tiny_mce_popup.js",{type=>"text/javascript"});
 	my $output = '<fieldset><legend>Insert A Link</legend>
 		<fieldset><legend>Link Settings</legend>'.$f->print.'</fieldset>
-	<script language="javascript">
+	<script type="text/javascript">
 function createLink() {
     if (window.opener) {        
         if (document.getElementById("url_formId").value == "") {
@@ -131,7 +131,7 @@ sub www_richEditViewThumbnail {
 		$output .= '<br />';
 		$output .= $image->get("filename");
 		$output .= '</div>';
-		$output .= '<script type="text/javascript" language="javascript">';
+		$output .= '<script type="text/javascript">';
 		$output .= "\nvar src = '".$image->getFileUrl."';\n";
 		$output .= "if(src.length > 0) {
 				var manager=window.parent;
diff --git a/lib/WebGUI/Operation/ProductManager.pm b/lib/WebGUI/Operation/ProductManager.pm
index 2835253b3..edd1e9d6d 100755
--- a/lib/WebGUI/Operation/ProductManager.pm
+++ b/lib/WebGUI/Operation/ProductManager.pm
@@ -159,7 +159,7 @@ sub www_editProductSave {
 	push(@error, $i18n->get('edit product weight error')) unless (defined $session{form}{weight} && $session{form}{price} =~ /^\d+(\.\d+)?$/);
 	push(@error, $i18n->get('edit product sku error')) unless ($session{form}{sku});
 	
-	return '<ul><li>'.join('</li><li>', @error).'</li></ul><br>'.WebGUI::Operation::execute('editProduct') if (@error);	
+	return '<ul><li>'.join('</li><li>', @error).'</li></ul><br />'.WebGUI::Operation::execute('editProduct') if (@error);	
 
 	$productId = $session{form}{productId};
 	$product = WebGUI::Product->new($productId);
@@ -335,7 +335,7 @@ sub www_editProductParameterOptionSave {
 	push (@error, $i18n->get('edit option value error')) unless ($session{form}{value});
 	push (@error, $i18n->get('edit option parameterId error')) unless ($session{form}{parameterId});
 
-	return '<ul><li>'.join('</li><li>', @error).'</li></ul><br>'.WebGUI::Operation::execute('editProduct') if (@error);
+	return '<ul><li>'.join('</li><li>', @error).'</li></ul><br />'.WebGUI::Operation::execute('editProduct') if (@error);
 
 	$product = WebGUI::Product->getByParameterId($session{form}{parameterId});
 	$optionId = $session{form}{optionId};
@@ -425,13 +425,13 @@ sub www_editSkuTemplate {
 	$productId = $session{form}{productId};
 	$product = WebGUI::Product->new($productId);
 	
-	$output .= "Available are: <br>\n";
+	$output .= "Available are: <br />\n";
 	$output .= "<ul><li>base</li>\n";
 	foreach (@{$product->getParameter}) {
 		($name = $_->{name}) =~ s/[ ><]/\./g;
 		$output .= "<li>param.".$name."</li>\n";
 	}
-	$output .= "</ul><br>";
+	$output .= "</ul><br />";
 	
 	$f = WebGUI::HTMLForm->new;
 	$f->hidden(
@@ -599,21 +599,21 @@ sub www_manageProduct {
 	
 	$output .= "<h2>Parameters</h2>";
 	$output .= '<a href="'.WebGUI::URL::page('op=editProductParameter;parameterId=new;productId='.$product->get('productId')).'">'.
-		$i18n->get('add parameter').'</a><br>';
+		$i18n->get('add parameter').'</a><br />';
 	foreach $parameter (@{$product->getParameter}) {
 		$output .= deleteIcon('op=deleteProductParameter;parameterId='.$parameter->{parameterId}).
 			editIcon('op=editProductParameter;parameterId='.$parameter->{parameterId});
-		$output .= '<span style="margin-left: 10px"><b>'.$parameter->{name}.'</b></span><br>';
+		$output .= '<span style="margin-left: 10px"><b>'.$parameter->{name}.'</b></span><br />';
 		$output .= '<a style="margin-left: 20px" href="'.
 			WebGUI::URL::page('op=editProductParameterOption;optionId=new;parameterId='.$parameter->{parameterId}).'">'.
-			$i18n->get('add option').'</a><br>';
+			$i18n->get('add option').'</a><br />';
 		foreach $optionId (@{$parameter->{options}}) {
 			$option = $product->getOption($optionId);
 			$output .= '<span style="margin-left: 20px">'.
 				deleteIcon('op=deleteProductParameterOption;optionId='.$option->{optionId}).
-				editIcon('op=editProductParameterOption;parameterId='.$parameter->{parameterId}.';optionId='.$option->{optionId}).$option->{value}.'</span><br>';
+				editIcon('op=editProductParameterOption;parameterId='.$parameter->{parameterId}.';optionId='.$option->{optionId}).$option->{value}.'</span><br />';
 		}
-		$output .= '<br>';
+		$output .= '<br />';
 	}
 
 	return _submenu($output, 'manage product', 'manage product', 'ProductManager');
diff --git a/lib/WebGUI/Operation/ProfileSettings.pm b/lib/WebGUI/Operation/ProfileSettings.pm
index 6f188d999..31d0d2a97 100644
--- a/lib/WebGUI/Operation/ProfileSettings.pm
+++ b/lib/WebGUI/Operation/ProfileSettings.pm
@@ -301,7 +301,7 @@ sub www_editProfileSettings {
 		$output .= moveDownIcon('op=moveProfileCategoryDown;cid='.$category{profileCategoryId}); 
 		$output .= ' <b>';
 		$output .= WebGUI::Operation::Shared::secureEval($category{categoryName});
-		$output .= '</b><br>';
+		$output .= '</b><br />';
 		$b = WebGUI::SQL->read("select * from userProfileField where 
 			profileCategoryId=".quote($category{profileCategoryId})." order by sequenceNumber");
 		while (%field = $b->hash) {
@@ -312,7 +312,7 @@ sub www_editProfileSettings {
                        	$output .= moveDownIcon('op=moveProfileFieldDown;fid='.$field{fieldName});
                        	$output .= ' ';
 			$output .= WebGUI::Operation::Shared::secureEval($field{fieldLabel});
-			$output .= '<br>';
+			$output .= '<br />';
 		}
 		$b->finish;
 	}
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index abb598cc9..33702d951 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -229,8 +229,8 @@ sub www_editSettings {
                 -extras=>' onChange="alert(\''.$i18n->get("Illegal Warning").'\')" '
         );
 # auth settings 
-	WebGUI::Style::setScript($session{config}{extrasURL}."/swapLayers.js",{language=>"Javascript"});
-   	$tabform->getTab("auth")->raw('<script language="JavaScript" > var active="'.$session{setting}{authMethod}.'"; </script>');
+	WebGUI::Style::setScript($session{config}{extrasURL}."/swapLayers.js",{type=>"text/javascript"});
+   	$tabform->getTab("auth")->raw('<script type="text/javascript" > var active="'.$session{setting}{authMethod}.'"; </script>');
    	my $options;
    	foreach (@{$session{config}{authMethods}}) {
       		$options->{$_} = $_;
@@ -242,7 +242,7 @@ sub www_editSettings {
 		-value=>[$session{setting}{authMethod}],
 		-extras=>"onChange=\"active=operateHidden(this.options[this.selectedIndex].value,active)\""
 		);
-	my $jscript = '<script language="JavaScript">';
+	my $jscript = '<script type="text/javascript">';
 	foreach (@{$session{config}{authMethods}}) {
 		my $authInstance = WebGUI::Operation::Auth::getInstance($_,1);
 		$tabform->getTab("auth")->raw('<tr id="'.$_.'"><td colspan="2" width="100%"><table border=0 cellspacing=0 cellpadding=0  width="100%">'.$authInstance->editUserSettingsForm.'<tr><td width="304">&nbsp;</td><td width="496">&nbsp;</td></tr></table></td></tr>');
diff --git a/lib/WebGUI/Operation/Subscription.pm b/lib/WebGUI/Operation/Subscription.pm
index a4b672a82..f1c086baf 100644
--- a/lib/WebGUI/Operation/Subscription.pm
+++ b/lib/WebGUI/Operation/Subscription.pm
@@ -352,9 +352,9 @@ sub www_listSubscriptionCodes {
 
 	$codes = $p->getPageData;
 
-	$output .= '<br>'.$delete.'<br>' if ($delete);
+	$output .= '<br />'.$delete.'<br />' if ($delete);
 	$output .= $p->getBarTraditional($session{form}{pn});
-	$output .= '<br>';
+	$output .= '<br />';
 	$output .= '<table border="1" cellpadding="5" cellspacing="0" align="center">';
 	$output .= '<tr>';
 	$output .= '<th>'.$i18n->get('batchId').'</th><th>'.$i18n->get('code').'</th><th>'.$i18n->get('creation date').
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 68c67913c..74ad35b2c 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -225,8 +225,8 @@ sub www_editUser {
 	my $tabform = WebGUI::TabForm->new(\%tabs);
 	$tabform->formHeader({extras=>'autocomplete="off"'});
 	my $u = WebGUI::User->new(($session{form}{uid} eq 'new') ? '' : $session{form}{uid});
-	WebGUI::Style::setScript($session{config}{extrasURL}."/swapLayers.js", {language=>"JavaScript"});
-	$tabform->getTab("account")->raw('<script language="JavaScript" > var active="'.$u->authMethod.'"; </script>');
+	WebGUI::Style::setScript($session{config}{extrasURL}."/swapLayers.js", {type=>"text/javascript"});
+	$tabform->getTab("account")->raw('<script type="text/javascript" > var active="'.$u->authMethod.'"; </script>');
     	$tabform->hidden({name=>"op",value=>"editUserSave"});
     	$tabform->hidden({name=>"uid",value=>$session{form}{uid}});
     	$tabform->getTab("account")->raw('<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr>');
@@ -270,7 +270,7 @@ sub www_editUser {
 		-value=>[$u->authMethod],
 		-extras=>"onChange=\"active=operateHidden(this.options[this.selectedIndex].value,active)\""
 		);
-	my $jscript = '<script language="JavaScript">';
+	my $jscript = '<script type="text/javascript">';
 	foreach (@{$session{config}{authMethods}}) {
 		my $authInstance = WebGUI::Operation::Auth::getInstance($_,$u->userId);
 		$tabform->getTab("account")->raw('<tr id="'.$_.'"><td colspan="2" align="center"><table>'.$authInstance->editUserForm.'<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr></table></td></tr>');