diff --git a/plist b/plist
index e71669608..c1a7e1a4d 100644
--- a/plist
+++ b/plist
@@ -1401,7 +1401,6 @@
 /usr/local/opnsense/www/js/qrcode.js
 /usr/local/opnsense/www/js/theme.js
 /usr/local/opnsense/www/js/tokenize2.js
-/usr/local/opnsense/www/js/tokenize2.min.js
 /usr/local/opnsense/www/themes/opnsense/LICENSE
 /usr/local/opnsense/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.eot
 /usr/local/opnsense/www/themes/opnsense/assets/fonts/SourceSansPro-Bold/SourceSansPro-Bold.otf
diff --git a/src/opnsense/mvc/app/views/layouts/default.volt b/src/opnsense/mvc/app/views/layouts/default.volt
index 58943d5e9..92c0b7788 100644
--- a/src/opnsense/mvc/app/views/layouts/default.volt
+++ b/src/opnsense/mvc/app/views/layouts/default.volt
@@ -165,7 +165,7 @@
         </script>
 
         <!-- JQuery Tokenize2 (https://zellerda.github.io/Tokenize2/) -->
-        <script src="/ui/js/tokenize2.min.js"></script>
+        <script src="/ui/js/tokenize2.js"></script>
         <link rel="stylesheet" type="text/css" href="{{theme_file_or_default('/css/tokenize2.css', theme_name)}}" rel="stylesheet" />
 
         <!-- Bootgrind (grid system from http://www.jquery-bootgrid.com/ )  -->
diff --git a/src/opnsense/www/js/tokenize2.min.js b/src/opnsense/www/js/tokenize2.min.js
deleted file mode 100644
index a2c1ecff0..000000000
--- a/src/opnsense/www/js/tokenize2.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(o){"function"==typeof define&&define.amd?define(["jquery"],o):"object"==typeof module&&module.exports?module.exports=function(t,e){return void 0===e&&(e="undefined"!=typeof window?require("jquery"):require("jquery")(t)),o(e),e}:o(jQuery)}(function(r){var s=function(t,e){this.control=!1,this.element=r(t),this.options=r.extend({},s.DEFAULTS,e),this.options.tabIndex=-1===this.options.tabIndex?0:this.options.tabIndex,this.options.sortable=1!==this.options.tokensMaxItems&&this.options.sortable,this.bind(),this.trigger("tokenize:load")},o=8,i=9,n=13,a=27,h=38,d=40,p=17,e=16;s.VERSION="1.0",s.DEBOUNCE=null,s.DEFAULTS={tokensMaxItems:0,tokensAllowCustom:!1,dropdownMaxItems:10,searchMinLength:0,searchFromStart:!0,searchHighlight:!0,displayNoResultsMessage:!1,noResultsMessageText:'No results mached "%s"',delimiter:",",dataSource:"select",debounce:0,placeholder:!1,sortable:!1,allowEmptyValues:!1,zIndexMargin:500,tabIndex:0},s.prototype.trigger=function(t,e,o,i){this.element.trigger(t,e,o,i)},s.prototype.bind=function(){this.element.on("tokenize:load",{},r.proxy(function(){this.init()},this)).on("tokenize:clear",{},r.proxy(function(){this.clear()},this)).on("tokenize:remap",{},r.proxy(function(){this.remap()},this)).on("tokenize:select",{},r.proxy(function(t,e){this.focus(e)},this)).on("tokenize:deselect",{},r.proxy(function(){this.blur()},this)).on("tokenize:search",{},r.proxy(function(t,e){this.find(e)},this)).on("tokenize:paste",{},r.proxy(function(){this.paste()},this)).on("tokenize:dropdown:up",{},r.proxy(function(){this.dropdownSelectionMove(-1)},this)).on("tokenize:dropdown:down",{},r.proxy(function(){this.dropdownSelectionMove(1)},this)).on("tokenize:dropdown:clear",{},r.proxy(function(){this.dropdownClear()},this)).on("tokenize:dropdown:show",{},r.proxy(function(){this.dropdownShow()},this)).on("tokenize:dropdown:hide",{},r.proxy(function(){this.dropdownHide()},this)).on("tokenize:dropdown:fill",{},r.proxy(function(t,e){this.dropdownFill(e)},this)).on("tokenize:dropdown:itemAdd",{},r.proxy(function(t,e){this.dropdownAddItem(e)},this)).on("tokenize:keypress",{},r.proxy(function(t,e){this.keypress(e)},this)).on("tokenize:keydown",{},r.proxy(function(t,e){this.keydown(e)},this)).on("tokenize:keyup",{},r.proxy(function(t,e){this.keyup(e)},this)).on("tokenize:tokens:reorder",{},r.proxy(function(){this.reorder()},this)).on("tokenize:tokens:add",{},r.proxy(function(t,e,o,i){this.tokenAdd(e,o,i)},this)).on("tokenize:tokens:remove",{},r.proxy(function(t,e){this.tokenRemove(e)},this))},s.prototype.init=function(){this.id=this.guid(),this.element.hide(),this.element.attr("multiple")||console.error("Attribute multiple is missing, tokenize2 can be buggy !"),this.dropdown=void 0,this.searchContainer=r('<li class="token-search" />'),this.input=r('<input autocomplete="off" />').on("keydown",{},r.proxy(function(t){this.trigger("tokenize:keydown",[t])},this)).on("keypress",{},r.proxy(function(t){this.trigger("tokenize:keypress",[t])},this)).on("keyup",{},r.proxy(function(t){this.trigger("tokenize:keyup",[t])},this)).on("focus",{},r.proxy(function(){this.input.val().length>=this.options.searchMinLength&&0<this.input.val().length&&this.trigger("tokenize:search",[this.input.val()])},this)).on("paste",{},r.proxy(function(){this.options.tokensAllowCustom&&setTimeout(r.proxy(function(){this.trigger("tokenize:paste")},this),10)},this)),this.tokensContainer=r('<ul class="tokens-container form-control" />').addClass(this.element.attr("data-class")).attr("tabindex",this.options.tabIndex).append(this.searchContainer.append(this.input)),!1!==this.options.placeholder&&(this.placeholder=r('<li class="placeholder" />').html(this.options.placeholder),this.tokensContainer.prepend(this.placeholder),this.element.on("tokenize:tokens:add tokenize:remap tokenize:select tokenize:deselect tokenize:tokens:remove",r.proxy(function(){this.container.hasClass("focus")||0<r("li.token",this.tokensContainer).length||0<this.input.val().length?this.placeholder.hide():this.placeholder.show()},this))),this.container=r('<div class="tokenize" />').attr("id",this.id),this.container.append(this.tokensContainer).insertAfter(this.element),this.container.focusin(r.proxy(function(t){this.trigger("tokenize:select",[r(t.target)[0]===this.tokensContainer[0]])},this)).focusout(r.proxy(function(){this.trigger("tokenize:deselect")},this)),1===this.options.tokensMaxItems&&this.container.addClass("single"),this.options.sortable&&(void 0!==r.ui?(this.container.addClass("sortable"),this.tokensContainer.sortable({items:"li.token",cursor:"move",placeholder:"token shadow",forcePlaceholderSize:!0,update:r.proxy(function(){this.trigger("tokenize:tokens:reorder")},this),start:r.proxy(function(){this.searchContainer.hide()},this),stop:r.proxy(function(){this.searchContainer.show()},this)})):(this.options.sortable=!1,console.error("jQuery UI is not loaded, sortable option has been disabled"))),this.element.on("tokenize:tokens:add tokenize:tokens:remove",r.proxy(function(){0<this.options.tokensMaxItems&&r("li.token",this.tokensContainer).length>=this.options.tokensMaxItems?this.searchContainer.hide():this.searchContainer.show()},this)).on("tokenize:keydown tokenize:keyup tokenize:loaded",r.proxy(function(){this.scaleInput()},this)),this.trigger("tokenize:remap"),this.trigger("tokenize:tokens:reorder"),this.trigger("tokenize:loaded"),this.element.is(":disabled")&&this.disable()},s.prototype.reorder=function(){var o,i;this.options.sortable&&r.each(this.tokensContainer.sortable("toArray",{attribute:"data-value"}),r.proxy(function(t,e){i=r('option[value="'+r.escapeSelector(e)+'"]',this.element),void 0===o?i.prependTo(this.element):o.after(i),o=i},this))},s.prototype.paste=function(){var t=new RegExp(this.escapeRegex(Array.isArray(this.options.delimiter)?this.options.delimiter.join("|"):this.options.delimiter),"ig");t.test(this.input.val())&&r.each(this.input.val().split(t),r.proxy(function(t,e){this.trigger("tokenize:tokens:add",[e,null,!0])},this))},s.prototype.tokenAdd=function(e,t,o){if(e=this.escape(e),t=t||e,o=o||!1,this.resetInput(),void 0===e||!this.options.allowEmptyValues&&""===e)return this.trigger("tokenize:tokens:error:empty"),this;if(0<this.options.tokensMaxItems&&r("li.token",this.tokensContainer).length>=this.options.tokensMaxItems)return this.trigger("tokenize:tokens:error:max"),this;if(0<r('li.token[data-value="'+r.escapeSelector(e)+'"]',this.tokensContainer).length)return this.trigger("tokenize:tokens:error:duplicate",[e,t]),this;if(r('option[value="'+r.escapeSelector(e)+'"]',this.element).length)r('option[value="'+r.escapeSelector(e)+'"]',this.element).attr("selected","selected").prop("selected",!0);else if(o)this.element.append(r("<option selected />").val(e).html(t));else{if(!this.options.tokensAllowCustom)return this.trigger("tokenize:tokens:error:notokensAllowCustom"),this;this.element.append(r('<option selected data-type="custom" />').val(e).html(t))}return r('<li class="token" />').attr("data-value",e).append("<span>"+t+"</span>").prepend(r('<a class="dismiss" />').on("mousedown touchstart",{},r.proxy(function(t){t.preventDefault(),this.trigger("tokenize:tokens:remove",[e])},this))).insertBefore(this.searchContainer),this.trigger("tokenize:dropdown:hide"),this},s.prototype.tokenRemove=function(t){var e=r('option[value="'+r.escapeSelector(t)+'"]',this.element);return"custom"===e.attr("data-type")?e.remove():e.removeAttr("selected").prop("selected",!1),r('li.token[data-value="'+r.escapeSelector(t)+'"]',this.tokensContainer).remove(),this.trigger("tokenize:tokens:reorder"),this},s.prototype.remap=function(){return r("option:selected",this.element).each(r.proxy(function(t,e){this.trigger("tokenize:tokens:add",[r(e).val(),r(e).html(),!1])},this)),this},s.prototype.disable=function(){return this.tokensContainer.addClass("disabled"),this.searchContainer.hide(),this},s.prototype.enable=function(){return this.tokensContainer.removeClass("disabled"),this.searchContainer.show(),this},s.prototype.focus=function(t){this.element.is(":disabled")?this.tokensContainer.blur():(t&&this.input.focus(),this.container.addClass("focus"))},s.prototype.blur=function(){this.isDropdownOpen()&&this.trigger("tokenize:dropdown:hide"),this.container.removeClass("focus"),this.resetPending(),this.tokensContainer.attr("tabindex")||this.tokensContainer.attr("tabindex",this.options.tabIndex)},s.prototype.keydown=function(t){if("keydown"===t.type)switch(t.keyCode){case o:if(this.input.val().length<1){if(t.preventDefault(),0<r("li.token.pending-delete",this.tokensContainer).length)this.trigger("tokenize:tokens:remove",[r("li.token.pending-delete",this.tokensContainer).first().attr("data-value")]);else{var e=r("li.token:last",this.tokensContainer);0<e.length&&(this.trigger("tokenize:tokens:markForDelete",[e.attr("data-value")]),e.addClass("pending-delete"))}this.trigger("tokenize:dropdown:hide")}break;case i:t.shiftKey?this.tokensContainer.removeAttr("tabindex"):this.pressedDelimiter(t);break;case n:this.pressedDelimiter(t);break;case a:this.resetPending();break;case h:t.preventDefault(),this.trigger("tokenize:dropdown:up");break;case d:t.preventDefault(),this.trigger("tokenize:dropdown:down");break;case p:this.control=!0;break;default:this.resetPending()}else t.preventDefault()},s.prototype.keyup=function(t){if("keyup"===t.type)switch(t.keyCode){case i:case n:case a:case h:case d:case e:break;case p:this.control=!1;break;case o:default:this.input.val().length>=this.options.searchMinLength&&0<this.input.val().length?this.trigger("tokenize:search",[this.input.val()]):this.trigger("tokenize:dropdown:hide")}else t.preventDefault()},s.prototype.keypress=function(t){if("keypress"!==t.type||this.element.is(":disabled"))t.preventDefault();else{var e=!1;Array.isArray(this.options.delimiter)?0<=this.options.delimiter.indexOf(String.fromCharCode(t.which))&&(e=!0):String.fromCharCode(t.which)===this.options.delimiter&&(e=!0),e&&this.pressedDelimiter(t)}},s.prototype.pressedDelimiter=function(t){this.resetPending(),this.isDropdownOpen()&&0<r("li.active",this.dropdown).length&&!1===this.control?(t.preventDefault(),r("li.active a",this.dropdown).trigger("mousedown")):0<this.input.val().length&&(t.preventDefault(),this.trigger("tokenize:tokens:add",[this.input.val()]))},s.prototype.find=function(t){if(t.length<this.options.searchMinLength)return this.trigger("tokenize:dropdown:hide"),!1;this.lastSearchTerms=t,"select"===this.options.dataSource?this.dataSourceLocal(t):"function"==typeof this.options.dataSource?this.options.dataSource(t,this):this.dataSourceRemote(t)},s.prototype.dataSourceRemote=function(t){this.debounce(r.proxy(function(){void 0!==this.xhr&&this.xhr.abort(),this.xhr=r.ajax(this.options.dataSource,{data:{search:t},dataType:"json",success:r.proxy(function(t){var o=[];r.each(t,function(t,e){o.push(e)}),this.trigger("tokenize:dropdown:fill",[o])},this)})},this),this.options.debounce)},s.prototype.dataSourceLocal=function(t){var e=this.transliteration(t),o=[],i=(this.options.searchFromStart?"^":"")+this.escapeRegex(e),n=new RegExp(i,"i"),s=this;r("option",this.element).not(":selected, :disabled").each(function(){n.test(s.transliteration(r(this).html()))&&o.push({value:r(this).attr("value"),text:r(this).html()})}),this.trigger("tokenize:dropdown:fill",[o])},s.prototype.debounce=function(t,e){var o=arguments,i=r.proxy(function(){t.apply(this,o),this.debounceTimeout=void 0},this);void 0!==this.debounceTimeout&&clearTimeout(this.debounceTimeout),this.debounceTimeout=setTimeout(i,e||0)},s.prototype.dropdownShow=function(){this.isDropdownOpen()||(r(".tokenize-dropdown").remove(),this.dropdown=r('<div class="tokenize-dropdown dropdown"><ul class="dropdown-menu" /></div>').attr("data-related",this.id),r("body").append(this.dropdown),this.dropdown.show(),this.dropdown.css("z-index",this.calculatezindex()+this.options.zIndexMargin),r(window).on("resize scroll",{},r.proxy(function(){this.dropdownMove()},this)).trigger("resize"),this.trigger("tokenize:dropdown:shown"))},s.prototype.calculatezindex=function(){var t=this.container,e=0;if(!isNaN(parseInt(t.css("z-index")))&&0<parseInt(t.css("z-index"))&&(e=parseInt(t.css("z-index"))),e<1)for(;t.length;)if(0<(t=t.parent()).length){if(!isNaN(parseInt(t.css("z-index")))&&0<parseInt(t.css("z-index")))return parseInt(t.css("z-index"));if(t.is("html"))break}return e},s.prototype.dropdownHide=function(){this.isDropdownOpen()&&(r(window).off("resize scroll"),this.dropdown.remove(),this.dropdown=void 0,this.trigger("tokenize:dropdown:hidden"))},s.prototype.dropdownClear=function(){this.dropdown&&this.dropdown.find(".dropdown-menu li").remove()},s.prototype.dropdownFill=function(t){t&&0<t.length?(this.trigger("tokenize:dropdown:show"),this.trigger("tokenize:dropdown:clear"),r.each(t,r.proxy(function(t,e){r("li.dropdown-item",this.dropdown).length<=this.options.dropdownMaxItems&&this.trigger("tokenize:dropdown:itemAdd",[e])},this)),r("li.active",this.dropdown).length<1&&r("li:first",this.dropdown).addClass("active"),r("li.dropdown-item",this.dropdown).length<1?this.trigger("tokenize:dropdown:hide"):this.trigger("tokenize:dropdown:filled")):this.options.displayNoResultsMessage?(this.trigger("tokenize:dropdown:show"),this.trigger("tokenize:dropdown:clear"),this.dropdown.find(".dropdown-menu").append(r('<li class="dropdown-item locked" />').html(this.options.noResultsMessageText.replace("%s",this.input.val())))):this.trigger("tokenize:dropdown:hide"),r(window).trigger("resize")},s.prototype.dropdownSelectionMove=function(t){if(0<r("li.active",this.dropdown).length)if(r("li.active",this.dropdown).is("li:"+(0<t?"last-child":"first-child")))r("li.active",this.dropdown).removeClass("active"),r("li:"+(0<t?"first-child":"last-child"),this.dropdown).addClass("active");else{var e=r("li.active",this.dropdown);e.removeClass("active"),0<t?e.next().addClass("active"):e.prev().addClass("active")}else r("li:first",this.dropdown).addClass("active")},s.prototype.dropdownAddItem=function(t){if(this.isDropdownOpen()){var e=r('<li class="dropdown-item" />').html(this.dropdownItemFormat(t)).on("mouseover",r.proxy(function(t){t.preventDefault(),t.target=this.fixTarget(t.target),r("li",this.dropdown).removeClass("active"),r(t.target).parent().addClass("active")},this)).on("mouseout",r.proxy(function(){r("li",this.dropdown).removeClass("active")},this)).on("mousedown touchstart",r.proxy(function(t){t.preventDefault(),t.target=this.fixTarget(t.target),this.trigger("tokenize:tokens:add",[r(t.target).attr("data-value"),r(t.target).attr("data-text"),!0])},this));r('li.token[data-value="'+e.find("a").attr("data-value")+'"]',this.tokensContainer).length<1&&(this.dropdown.find(".dropdown-menu").append(e),this.trigger("tokenize:dropdown:itemAdded",[t]))}},s.prototype.fixTarget=function(t){var e=r(t);if(!e.data("value")){var o=e.find("a");if(o.length)return o.get(0);var i=e.parents("[data-value]");if(i.length)return i.get(0)}return e.get(0)},s.prototype.dropdownItemFormat=function(t){if(t.hasOwnProperty("text")){var e="";if(this.options.searchHighlight){var o=new RegExp((this.options.searchFromStart?"^":"")+"("+this.escapeRegex(this.transliteration(this.lastSearchTerms))+")","gi");e=t.text.replace(o,'<span class="tokenize-highlight">$1</span>')}else e=t.text;return r("<a />").html(e).attr({"data-value":t.value,"data-text":t.text})}},s.prototype.dropdownMove=function(){var t=this.tokensContainer.offset(),e=this.tokensContainer.outerHeight(),o=this.tokensContainer.outerWidth();t.top+=e,this.dropdown.css({width:o}).offset(t)},s.prototype.isDropdownOpen=function(){return void 0!==this.dropdown},s.prototype.clear=function(){return r.each(r("li.token",this.tokensContainer),r.proxy(function(t,e){this.trigger("tokenize:tokens:remove",[r(e).attr("data-value")])},this)),this.trigger("tokenize:dropdown:hide"),this},s.prototype.resetPending=function(){var t=r("li.pending-delete:last",this.tokensContainer);0<t.length&&(this.trigger("tokenize:tokens:cancelDelete",[t.attr("data-value")]),t.removeClass("pending-delete"))},s.prototype.scaleInput=function(){var t,e;this.ctx||(this.ctx=document.createElement("canvas").getContext("2d")),this.ctx.font=this.input.css("font-style")+" "+this.input.css("font-variant")+" "+this.input.css("font-weight")+" "+Math.ceil(parseFloat(this.input.css("font-size")))+"px "+this.input.css("font-family"),t=Math.round(this.ctx.measureText(this.input.val()+"M").width)+Math.ceil(parseFloat(this.searchContainer.css("margin-left")))+Math.ceil(parseFloat(this.searchContainer.css("margin-right"))),(e=this.tokensContainer.width()-(Math.ceil(parseFloat(this.tokensContainer.css("border-left-width")))+Math.ceil(parseFloat(this.tokensContainer.css("border-right-width"))+Math.ceil(parseFloat(this.tokensContainer.css("padding-left")))+Math.ceil(parseFloat(this.tokensContainer.css("padding-right"))))))<=t&&(t=e),this.searchContainer.width(t),this.ctx.restore()},s.prototype.resetInput=function(){this.input.val(""),this.scaleInput()},s.prototype.escape=function(t){var e=document.createElement("div");return e.innerHTML=t,t=e.textContent||e.innerText||"",String(t).replace(/["]/g,function(){return'"'})},s.prototype.escapeRegex=function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},s.prototype.guid=function(){function t(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return t()+t()+"-"+t()+"-"+t()+"-"+t()+"-"+t()+t()+t()},s.prototype.toArray=function(){var t=[];return r("option:selected",this.element).each(function(){t.push(r(this).val())}),t},s.prototype.transliteration=function(t){var e={"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"};return t.replace(/[^\u0000-\u007E]/g,function(t){return e[t]||t})};var t=r.fn.tokenize2;r.fn.tokenize2=function(i){var n=[];return this.filter("select").each(function(){var t=r(this),e=t.data("tokenize2"),o="object"==typeof i&&i;e||t.data("tokenize2",new s(this,o)),n.push(t.data("tokenize2"))}),1<n.length?n:n[0]},r.fn.tokenize2.Constructor=s,r.fn.tokenize2.noConflict=function(){return r.fn.tokenize2=t,this}});
\ No newline at end of file
diff --git a/src/www/vpn_ipsec_settings.php b/src/www/vpn_ipsec_settings.php
index 8f40623fc..0f79a7162 100644
--- a/src/www/vpn_ipsec_settings.php
+++ b/src/www/vpn_ipsec_settings.php
@@ -116,9 +116,10 @@ include("head.inc");
 
 ?>
 
-<!-- JQuery Tokenize (http://zellerda.com/projects/tokenize) -->
-<script src="/ui/js/tokenize2.min.js"></script>
+<!-- JQuery Tokenize2 (https://zellerda.github.io/Tokenize2/) -->
+<script src="/ui/js/tokenize2.js"></script>
 <link rel="stylesheet" type="text/css" href="<?=get_themed_filename("/css/tokenize2.css");?>">
+
 <script src="/ui/js/opnsense_ui.js"></script>
 
  <script>