diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 9bc916d540..d553c0841a 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -2576,7 +2576,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 				addOption(jQuery('#gateway'), gwtext, name);
 				// Auto submit form?
 				//document.iform.submit();
-				//$('status').innerHTML = '<img src="/themes/metallic/images/misc/loader.gif">';
+				//jQuery('#status').html('<img src="/themes/metallic/images/misc/loader.gif">');
 			} else {
 				report_failure();
 			}
@@ -2596,7 +2596,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 				addOption_v6(jQuery('#gatewayv6'), gwtext_v6, name);
 				// Auto submit form?
 				//document.iform.submit();
-				//$('statusv6').innerHTML = '<img src="/themes/metallic/images/misc/loader.gif">';
+				//jQuery('#statusv6').html('<img src="/themes/metallic/images/misc/loader.gif">');
 			} else {
 				report_failure_v6();
 			}
diff --git a/usr/local/www/services_captiveportal_vouchers.php b/usr/local/www/services_captiveportal_vouchers.php
index cbabf782ef..b8a562aec5 100644
--- a/usr/local/www/services_captiveportal_vouchers.php
+++ b/usr/local/www/services_captiveportal_vouchers.php
@@ -66,8 +66,8 @@ if($_REQUEST['generatekey']) {
 	exec("rm /tmp/key64.private /tmp/key64.public");
 	$alertmessage = gettext("You will need to recreate any existing Voucher Rolls due to the public and private key changes. Click cancel if you do not wish to recreate the vouchers.");
 	echo <<<EOF
-		\$('publickey').value = '{$publickey}';
-		\$('privatekey').value = '{$privatekey}';
+		jQuery('#publickey').val('{$publickey}');
+		jQuery('#privatekey').val('{$privatekey}');
 		alert('{$alertmessage}');
 		new Effect.Highlight('publickey');
 		new Effect.Highlight('privatekey');
@@ -331,12 +331,12 @@ include("head.inc");
 <script type="text/javascript">
 <!--
 function generatenewkey() {
-	$('publickey').value = 'One moment please...';
-	$('privatekey').value = 'One moment please...';
-	new Ajax.Request("services_captiveportal_vouchers.php?zone=<?php echo($cpzone); ?>&generatekey=true", {
-		method: 'get',
-		onSuccess: function(transport) {	
-			eval(transport.responseText);
+	jQuery('#publickey').val('One moment please...');
+	jQuery('#privatekey').val('One moment please...');
+	jQuery.ajax("services_captiveportal_vouchers.php?zone=<?php echo($cpzone); ?>&generatekey=true", {
+		type: 'get',
+		success: function(data) {	
+			eval(data);
 		}
 	});		
 }
@@ -351,8 +351,8 @@ function before_save() {
 	document.iform.msgnoaccess.disabled = false;
 	document.iform.msgexpired.disabled = false;
 	for(var x=0; x < <?php echo count($a_roll); ?>; x++)
-		$('addeditdelete' + x).show();
-	$('addnewroll').show();
+		jQuery('#addeditdelete' + x).show();
+	jQuery('#addnewroll').show();
 }
 function enable_change(enable_change) {
 	var endis;
@@ -381,12 +381,12 @@ function enable_change(enable_change) {
 		document.iform.msgnoaccess.disabled = true;
 		document.iform.msgexpired.disabled = true;
 		for(var x=0; x < <?php echo count($a_roll); ?>; x++)
-			$('addeditdelete' + x).hide();
-		$('addnewroll').hide();
+			jQuery('#addeditdelete' + x).hide();
+		jQuery('#addnewroll').hide();
 	} else {
 		for(var x=0; x < <?php echo count($a_roll); ?>; x++)
-			$('addeditdelete' + x).show();
-		$('addnewroll').show();
+			jQuery('#addeditdelete' + x).show();
+		jQuery('#addnewroll').show();
 	}
 }
 //-->
diff --git a/usr/local/www/services_snmp.php b/usr/local/www/services_snmp.php
index 925cb7be8f..c2f763f404 100755
--- a/usr/local/www/services_snmp.php
+++ b/usr/local/www/services_snmp.php
@@ -163,8 +163,8 @@ include("head.inc");
 <script language="JavaScript">
 <!--
 function check_deps() {
-	if ($('hostres').checked == true) {
-		$('mibii').checked = true;
+	if (jQuery('#hostres').prop('checked') == true) {
+		jQuery('#mibii').prop('checked',true);
 	}
 }
 
diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php
index 97b7769ed0..d2575a0e38 100644
--- a/usr/local/www/vpn_openvpn_client.php
+++ b/usr/local/www/vpn_openvpn_client.php
@@ -312,10 +312,10 @@ function autokey_change() {
 
 function useproxy_changed() {
 
-	if ($('proxy_authtype').value != 'none') {
-                $('proxy_authtype_opts').show();
+	if (jQuery('#proxy_authtype').val() != 'none') {
+                jQuery('#proxy_authtype_opts').show();
         } else {
-                $('proxy_authtype_opts').hide();
+                jQuery('#proxy_authtype_opts').hide();
         }
 }
 
diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php
index 493fab1f7d..a136f7b547 100755
--- a/usr/local/www/wizard.php
+++ b/usr/local/www/wizard.php
@@ -282,7 +282,7 @@ function showchange() {
                                 foreach($showfields as $showfield) {
                                         $showfield = strtolower($showfield);
                                         //print "\t\t" . 'document.iform.' . $showfield . ".display =\"none\";\n";
-					print "\t\t \$('". $showfield . "').hide();";
+					print "\t\t jQuery('#". $showfield . "').hide();";
                                 }
                         }
                         print "\t" . '} else {' . "\n";
@@ -291,7 +291,7 @@ function showchange() {
                                 foreach($showfields as $showfield) {
                                         $showfield = strtolower($showfield);
                                         #print "\t\t" . 'document.iform.' . $showfield . ".display =\"\";\n";
-					print "\t\t \$('". $showfield . "').show();";
+					print "\t\t jQuery('#". $showfield . "').show();";
                                 }
                         }
                         print "\t" . '}' . "\n";