diff --git a/js/auto_save.js b/js/auto_save.js
index 325bf6b..6e83ceb 100644
--- a/js/auto_save.js
+++ b/js/auto_save.js
@@ -1,14 +1,14 @@
-jQuery(document).ready(function () {
+jQuery(document).ready(function ($) {
 
 	// Send elements with class sf_autosave to the server for autosave
-	jQuery('.sf_autosave').keyup(function () {
+	$('.sf_autosave').keyup(function () {
 
 		var autosave_data = {};
 		autosave_data['ticket_id'] = SFAutoSave.ticket_id;
 
-		jQuery('.sf_autosave').each(function () {
-			element_key = jQuery(this).attr('name');
-			element_value = jQuery(this).val();
+		$('.sf_autosave').each(function () {
+			element_key = $(this).attr('name');
+			element_value = $(this).val();
 			autosave_data[element_key] = element_value
 		});
 
diff --git a/js/email_accounts.js b/js/email_accounts.js
index a7b3568..832b1d5 100644
--- a/js/email_accounts.js
+++ b/js/email_accounts.js
@@ -1,12 +1,12 @@
-jQuery(document).ready(function () {
-	jQuery('.delete_email_account').click(function (e) {
+jQuery(document).ready(function ($) {
+	$('.delete_email_account').click(function (e) {
 		e.preventDefault();
 
 		if (!confirm(SFEmailAccounts.sure_delete_account)) {
 			return;
 		}
 
-		var account_key = jQuery(this).data('account-id');
+		var account_key = $(this).data('account-id');
 		var form_action = "edit.php?post_type=" + SFEmailAccounts.post_type + "&page=" + SFEmailAccounts.slug;
 
 		var form = '';
@@ -16,28 +16,28 @@ jQuery(document).ready(function () {
 		form += '<input type="hidden" name="account_id" value=' + account_key + ' />';
 		form += '</form>';
 
-		jQuery('body').append(form);
-		jQuery('#remove_email_account').submit();
+		$('body').append(form);
+		$('#remove_email_account').submit();
 	});
 
 
-	jQuery('#add_new_email_account #imap_ssl').change(function () {
+	$('#add_new_email_account #imap_ssl').change(function () {
 		if (this.checked) {
 			// Change to default IMAP SSL port on enabling SSL
-			jQuery('#add_new_email_account #imap_port').val('993');
+			$('#add_new_email_account #imap_port').val('993');
 		} else {
 			// Change to default IMAP non-SSL port on disabling SSL
-			jQuery('#add_new_email_account #imap_port').val('143');
+			$('#add_new_email_account #imap_port').val('143');
 		}
 	});
 
-	jQuery('#add_new_email_account #smtp_ssl').change(function () {
+	$('#add_new_email_account #smtp_ssl').change(function () {
 		if (this.checked) {
 			// Change to default SMTP SSL port on enabling SSL
-			jQuery('#add_new_email_account #smtp_port').val('465');
+			$('#add_new_email_account #smtp_port').val('465');
 		} else {
 			// Change to default SMTP non-SSL port on disabling SSL
-			jQuery('#add_new_email_account #smtp_port').val('25');
+			$('#add_new_email_account #smtp_port').val('25');
 		}
 	});
 });
diff --git a/js/email_conversation.js b/js/email_conversation.js
index de266d9..3d39a19 100644
--- a/js/email_conversation.js
+++ b/js/email_conversation.js
@@ -1,11 +1,11 @@
-jQuery(document).ready(function () {
+jQuery(document).ready(function ($) {
 	// Send conversation to E-Mail ID's
 
 	var email_conversion = function (event) {
 		event.preventDefault();
-		var email_ids = jQuery('#email_conversation_to').val();
+		var email_ids = $('#email_conversation_to').val();
 
-		jQuery.ajax(ajaxurl, {
+		$.ajax(ajaxurl, {
 			type      : 'post',
 			data      : {
 				action                   : 'sf_forward_conversation',
@@ -14,26 +14,26 @@ jQuery(document).ready(function () {
 				_email_conversation_nonce: SFEmailConversation._email_conversation_nonce,
 			},
 			beforeSend: function () {
-				jQuery('#email_conversation_to').prop('disabled', true);
-				jQuery('#email_conversation_submit').prop('disabled', true);
-				jQuery('#email_conversation_status').text(SFEmailConversation.sending_emails);
+				$('#email_conversation_to').prop('disabled', true);
+				$('#email_conversation_submit').prop('disabled', true);
+				$('#email_conversation_status').text(SFEmailConversation.sending_emails);
 			},
 			success   : function (content) {
-				jQuery('#email_conversation_status').html(content);
+				$('#email_conversation_status').html(content);
 			},
 			error     : function () {
-				jQuery('#email_conversation_status').text(SFEmailConversation.failed_sending);
+				$('#email_conversation_status').text(SFEmailConversation.failed_sending);
 			},
 			complete  : function () {
-				jQuery('#email_conversation_to').prop('disabled', false);
-				jQuery('#email_conversation_submit').prop('disabled', false);
+				$('#email_conversation_to').prop('disabled', false);
+				$('#email_conversation_submit').prop('disabled', false);
 			},
 		});
 
 	}
 
-	jQuery('#email_conversation_submit').click(email_conversion);
-	jQuery('#email_conversation_to').keyup(function () {
+	$('#email_conversation_submit').click(email_conversion);
+	$('#email_conversation_to').keyup(function () {
 		if (event.keyCode == 10) {
 			email_conversion();
 		}
diff --git a/js/permissions.js b/js/permissions.js
index 11942b9..bb3594f 100644
--- a/js/permissions.js
+++ b/js/permissions.js
@@ -1,9 +1,9 @@
-jQuery(document).ready(function () {
-	jQuery('.permission_filters').change(function () {
-		var user_id = jQuery('#change_user option:selected').data('user-id');
-		var status = jQuery('#change_status option:selected').data('status');
+jQuery(document).ready(function ($) {
+	$('.permission_filters').change(function () {
+		var user_id = $('#change_user option:selected').data('user-id');
+		var status = $('#change_status option:selected').data('status');
 
-		jQuery.ajax(ajaxurl, {
+		$.ajax(ajaxurl, {
 			type   : 'post',
 			data   : {
 				action                     : 'get_user_permissions',
@@ -12,13 +12,13 @@ jQuery(document).ready(function () {
 				_get_user_permissions_nonce: SFPermissions._get_user_permissions_nonce,
 			},
 			success: function (content) {
-				jQuery('#user_permissions_table').html(content);
+				$('#user_permissions_table').html(content);
 			},
 		});
 	});
 
-	jQuery(document).on('change', '.sf_user_permissions_table .toggle_privilege', function () {
-		var checkbox = jQuery(this);
+	$(document).on('change', '.sf_user_permissions_table .toggle_privilege', function () {
+		var checkbox = $(this);
 		var checkbox_label = checkbox.siblings('.privilege_status');
 		var permission_identifier = checkbox.data('permission-identifier');
 
@@ -30,7 +30,7 @@ jQuery(document).ready(function () {
 		checkbox_label.html(SFPermissions.changing_status);
 		checkbox.prop('disabled', true);
 
-		jQuery.ajax(ajaxurl, {
+		$.ajax(ajaxurl, {
 			type    : 'post',
 			data    : {
 				action                    : 'set_user_permission',
diff --git a/js/predefined-replies.js b/js/predefined-replies.js
index 9d27a37..f2969b5 100644
--- a/js/predefined-replies.js
+++ b/js/predefined-replies.js
@@ -1,18 +1,18 @@
-jQuery(document).ready(function () {
+jQuery(document).ready(function ($) {
 
-	jQuery('#predefs').change(function () {
+	$('#predefs').change(function () {
 		if (this.old_child == undefined) {
 			this.old_child = 1;
 		}
 
 		// New selection of combo box
-		new_content = jQuery('#predefs').find('option:selected').data('content');
+		new_content = $('#predefs').find('option:selected').data('content');
 
 		// Previous selection of combo box
-		old_content = jQuery('.predef:nth-child(' + this.old_child + ')').data('content');
+		old_content = $('.predef:nth-child(' + this.old_child + ')').data('content');
 
 		// Current value of reply text box
-		current_content = jQuery('#reply').val();
+		current_content = $('#reply').val();
 
 		if (0 == new_content.length) {
 			return;
@@ -21,12 +21,12 @@ jQuery(document).ready(function () {
 		// Show confirmation message if reply box content is manually changed by user
 		if (current_content != old_content) {
 			if (false == window.confirm(SFPredefinedReplies.message)) {
-				jQuery('.predef:nth-child(' + this.old_child + ')').prop('selected', true);
+				$('.predef:nth-child(' + this.old_child + ')').prop('selected', true);
 				return;
 			}
 		}
 
-		jQuery('#reply').val(new_content);
-		this.old_child = jQuery('#predefs').find('option:selected').index() + 1;
+		$('#reply').val(new_content);
+		this.old_child = $('#predefs').find('option:selected').index() + 1;
 	});
 });
\ No newline at end of file
diff --git a/js/preferences.js b/js/preferences.js
index 7f567f9..0a36235 100644
--- a/js/preferences.js
+++ b/js/preferences.js
@@ -1,8 +1,8 @@
-jQuery(document).ready(function () {
+jQuery(document).ready(function ($) {
 
 	// Update E-Mail notification settings on checkbox toggle
-	jQuery(document).on('change', '.sf_email_accounts_table .toggle_privilege', function () {
-		var checkbox = jQuery(this);
+	$(document).on('change', '.sf_email_accounts_table .toggle_privilege', function () {
+		var checkbox = $(this);
 		var checkbox_label = checkbox.siblings('.privilege_status');
 		var email_notfication_identifier = checkbox.data('email-notfication-identifier');
 
@@ -13,7 +13,7 @@ jQuery(document).ready(function () {
 		checkbox_label.html(SFPreferences.changing_state);
 		checkbox.prop('disabled', true);
 
-		jQuery.ajax(ajaxurl, {
+		$.ajax(ajaxurl, {
 			type    : 'post',
 			data    : {
 				action                      : 'set_email_notfication',
diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index 4ea5cbf..3c33819 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#customers").val()?(jQuery("#customers").focus(),alert(SFTickets.no_customer_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post .meta-item input[name='post_status']").val("sf_closed")}),jQuery(".sf_toggle_quoted_text").click(function(a){a.preventDefault(),jQuery(this).parent().html(jQuery(this).data("quoted_text"))})}),jQuery(document).ready(function(){jQuery(".sf_autosave").keyup(function(){var a={};a.ticket_id=SFAutoSave.ticket_id,jQuery(".sf_autosave").each(function(){element_key=jQuery(this).attr("name"),element_value=jQuery(this).val(),a[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",a,!1)})});
\ No newline at end of file
+jQuery(document).ready(function(){$(".toggle-link").click(function(a){var b=$(this).siblings(".toggle-content").css("display");$(".toggle-content").hide(500),$(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&($(this).siblings(".toggle-content").show(500),$(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),$($(".toggle-content")).each(function(){"none"==$(this).css("display")?$(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):$(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),$(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){a(".delete_email_account").click(function(b){if(b.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var c=a(this).data("account-id"),d="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,e="";e+='<form method="POST" id="remove_email_account" action="'+d+'">',e+='<input type="hidden" name="action" value="delete" />',e+=SFEmailAccounts.delete_email_account_nonce,e+='<input type="hidden" name="account_id" value='+c+" />",e+="</form>",a("body").append(e),a("#remove_email_account").submit()}}),a("#add_new_email_account #imap_ssl").change(function(){a("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),a("#add_new_email_account #smtp_ssl").change(function(){a("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(a){var b=function(b){b.preventDefault();var c=a("#email_conversation_to").val();a.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:c,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){a("#email_conversation_to").prop("disabled",!0),a("#email_conversation_submit").prop("disabled",!0),a("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(b){a("#email_conversation_status").html(b)},error:function(){a("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){a("#email_conversation_to").prop("disabled",!1),a("#email_conversation_submit").prop("disabled",!1)}})};a("#email_conversation_submit").click(b),a("#email_conversation_to").keyup(function(){10==event.keyCode&&b()})}),jQuery(document).ready(function(a){a(".permission_filters").change(function(){var b=a("#change_user option:selected").data("user-id"),c=a("#change_status option:selected").data("status");a.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:b,status:c,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(b){a("#user_permissions_table").html(b)}})}),a(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("permission-identifier"),e=b.prop("checked"),f=d.user_id,g=d.privilege_type,h=d.privilege_id;c.html(SFPermissions.changing_status),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:f,privilege_type:g,privilege_id:h,allowed:e,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPermissions.allowed:SFPermissions.not_allowed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){a("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=a("#predefs").find("option:selected").data("content"),old_content=a(".predef:nth-child("+this.old_child+")").data("content"),current_content=a("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void a(".predef:nth-child("+this.old_child+")").prop("selected",!0);a("#reply").val(new_content),this.old_child=a("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(a){a(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("email-notfication-identifier"),e=b.prop("checked"),f=d.privilege_type,g=d.privilege_id;c.html(SFPreferences.changing_state),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:f,privilege_id:g,allowed:e,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPreferences.subscribed:SFPreferences.unsubscribed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var b=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return b.on("close",function(){var c=b.state().get("selection").toJSON();a.each(c,function(){var b='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",c='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";a("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+b+"&nbsp;"+c+"</li>"),a("#reply-attachments").val(a("#reply-attachments").val()+_.escape(this.id)+",")})}),b.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(a){a("#supportflow-details .meta-item-ok-button").click(function(b){var c=a(this).siblings(".meta-item-dropdown").children("option:selected"),d=a(this).closest(".meta-item"),e=d.children(".meta-item-name"),f=d.children(".meta-item-label");e.val(c.val()),f.text(c.text()),b.preventDefault()}),a("#supportflow-details .meta-item-toggle-button").click(function(b){a(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),b.preventDefault()}),a(".save-button").click(function(b){return""==a("#subject").val()?(a("#subject").focus(),alert(SFTickets.no_title_msg),void b.preventDefault()):""==a("#customers").val()?(a("#customers").focus(),alert(SFTickets.no_customer_msg),void b.preventDefault()):void 0}),a("#reply").keypress(function(b){!b.ctrlKey||10!=b.keyCode&&13!=b.keyCode||""==a(this).val()||a("#post").submit()}),a("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&a("#insert-reply").val(a("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),a("#close-ticket-submit").click(function(){a("#post .meta-item input[name='post_status']").val("sf_closed")}),a(".sf_toggle_quoted_text").click(function(b){b.preventDefault(),a(this).parent().html(a(this).data("quoted_text"))})}),jQuery(document).ready(function(a){a(".sf_autosave").keyup(function(){var b={};b.ticket_id=SFAutoSave.ticket_id,a(".sf_autosave").each(function(){element_key=a(this).attr("name"),element_value=a(this).val(),b[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",b,!1)})});
\ No newline at end of file
diff --git a/js/ticket_attachments.js b/js/ticket_attachments.js
index 1f6a8a8..d0e85f2 100644
--- a/js/ticket_attachments.js
+++ b/js/ticket_attachments.js
@@ -18,11 +18,11 @@ jQuery(document).ready(function ($) {
 			// Handle results from media manager.
 			frame.on('close', function () {
 				var attachments = frame.state().get('selection').toJSON();
-				jQuery.each(attachments, function () {
+				$.each(attachments, function () {
 					var attachment_download_link = '<a class="reply-attachment-link" target="_blank" href="' + _.escape(this.url) + '">' + _.escape(this.filename) + '</a>';
 					var attachment_remove_link = '<a class="reply-attachment-remove delete" href="#" data-attachment-id=' + _.escape(this.id) + ' >' + SFTicketAttachments.remove_attachment + '</a>';
-					jQuery('#replies-attachments-list').append('<li id="media-items" class="reply-attachment">' + attachment_download_link + '&nbsp;' + attachment_remove_link + '</li>');
-					jQuery('#reply-attachments').val(jQuery('#reply-attachments').val() + _.escape(this.id) + ',');
+					$('#replies-attachments-list').append('<li id="media-items" class="reply-attachment">' + attachment_download_link + '&nbsp;' + attachment_remove_link + '</li>');
+					$('#reply-attachments').val($('#reply-attachments').val() + _.escape(this.id) + ',');
 				});
 			});
 
diff --git a/js/tickets.js b/js/tickets.js
index 865b833..d2bdd62 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -1,7 +1,7 @@
-jQuery(document).ready(function () {
-	jQuery('#supportflow-details .meta-item-ok-button').click(function (event) {
-		var dropdown = jQuery(this).siblings('.meta-item-dropdown').children('option:selected');
-		var meta_item = jQuery(this).closest('.meta-item');
+jQuery(document).ready(function ($) {
+	$('#supportflow-details .meta-item-ok-button').click(function (event) {
+		var dropdown = $(this).siblings('.meta-item-dropdown').children('option:selected');
+		var meta_item = $(this).closest('.meta-item');
 		var form_input = meta_item.children('.meta-item-name');
 		var label = meta_item.children('.meta-item-label');
 
@@ -11,21 +11,21 @@ jQuery(document).ready(function () {
 		event.preventDefault();
 	});
 
-	jQuery('#supportflow-details .meta-item-toggle-button').click(function (event) {
-		jQuery(this).closest('.meta-item').children('.meta-item-toggle-content').toggle(250);
+	$('#supportflow-details .meta-item-toggle-button').click(function (event) {
+		$(this).closest('.meta-item').children('.meta-item-toggle-content').toggle(250);
 		event.preventDefault();
 	});
 
 	// Require title and atleast customer before saving a ticket
-	jQuery('.save-button').click(function (event) {
-		if ('' == jQuery('#subject').val()) {
-			jQuery('#subject').focus();
+	$('.save-button').click(function (event) {
+		if ('' == $('#subject').val()) {
+			$('#subject').focus();
 			alert(SFTickets.no_title_msg);
 			event.preventDefault();
 			return;
 		}
-		if ('' == jQuery('#customers').val()) {
-			jQuery('#customers').focus();
+		if ('' == $('#customers').val()) {
+			$('#customers').focus();
 			alert(SFTickets.no_customer_msg);
 			event.preventDefault();
 			return;
@@ -33,32 +33,32 @@ jQuery(document).ready(function () {
 	});
 
 	// Submit post if user pressed Ctrl+Enter in reply content box
-	jQuery('#reply').keypress(function (event) {
-		if (event.ctrlKey && event.keyCode == 10 && $(this).val() != '') {
+	$('#reply').keypress(function (event) {
+		if (event.ctrlKey && ( event.keyCode == 10 || event.keyCode == 13 ) && $(this).val() != '') {
 			$('#post').submit();
 		}
 	});
 
 	// Toggle submit button text (Send Message/Add private note)
-	jQuery('#mark-private').change(function () {
+	$('#mark-private').change(function () {
 		if ('post.php' == SFTickets.pagenow) {
-			if (jQuery('#mark-private').prop('checked')) {
-				jQuery('#insert-reply').val(SFTickets.add_private_note);
+			if ($('#mark-private').prop('checked')) {
+				$('#insert-reply').val(SFTickets.add_private_note);
 			} else {
-				jQuery('#insert-reply').val(SFTickets.send_msg);
+				$('#insert-reply').val(SFTickets.send_msg);
 			}
 		}
 	});
 
 	// Close ticket wehen close ticket button is submitted
-	jQuery('#close-ticket-submit').click(function (event) {
-		jQuery("#post .meta-item input[name='post_status']").val('sf_closed');
+	$('#close-ticket-submit').click(function (event) {
+		$("#post .meta-item input[name='post_status']").val('sf_closed');
 	});
 
 	// Show quoted text	
-	jQuery('.sf_toggle_quoted_text').click(function (event) {
+	$('.sf_toggle_quoted_text').click(function (event) {
 		event.preventDefault();
-		jQuery(this).parent().html(jQuery(this).data('quoted_text'))
+		$(this).parent().html($(this).data('quoted_text'))
 	});
 
 });
diff --git a/js/toggle-links.js b/js/toggle-links.js
index 8b0ff88..1aac58b 100644
--- a/js/toggle-links.js
+++ b/js/toggle-links.js
@@ -1,24 +1,24 @@
 jQuery(document).ready(function () {
 	// Close all the different stat tables and toggle the status of clicked stat table
-	jQuery('.toggle-link').click(function (event) {
-		var current = jQuery(this).siblings('.toggle-content').css('display');
-		jQuery('.toggle-content').hide(500);
-		jQuery('.toggle-link').prop('title', SFToggleLinks.expand);
+	$('.toggle-link').click(function (event) {
+		var current = $(this).siblings('.toggle-content').css('display');
+		$('.toggle-content').hide(500);
+		$('.toggle-link').prop('title', SFToggleLinks.expand);
 		if ('none' == current) {
-			jQuery(this).siblings('.toggle-content').show(500);
-			jQuery(this).prop('title', SFToggleLinks.collapse);
+			$(this).siblings('.toggle-content').show(500);
+			$(this).prop('title', SFToggleLinks.collapse);
 		}
 		event.preventDefault();
 	});
 
 	// Set different type of statistics link title at page load
-	jQuery(jQuery('.toggle-content')).each(function () {
-		if ('none' == jQuery(this).css('display')) {
-			jQuery(this).siblings('.toggle-link').prop('title', SFToggleLinks.expand);
+	$($('.toggle-content')).each(function () {
+		if ('none' == $(this).css('display')) {
+			$(this).siblings('.toggle-link').prop('title', SFToggleLinks.expand);
 		} else {
-			jQuery(this).siblings('.toggle-link').prop('title', SFToggleLinks.collapse);
+			$(this).siblings('.toggle-link').prop('title', SFToggleLinks.collapse);
 		}
 
-		jQuery('.toggle-content').first().show(500);
+		$('.toggle-content').first().show(500);
 	});
 });
\ No newline at end of file