diff --git a/Resources/Public/JavaScript/Dist/bootstrap.cookieconsent.min.js b/Resources/Public/JavaScript/Dist/bootstrap.cookieconsent.min.js
index b2b2d2eac..f257e0960 100644
--- a/Resources/Public/JavaScript/Dist/bootstrap.cookieconsent.min.js
+++ b/Resources/Public/JavaScript/Dist/bootstrap.cookieconsent.min.js
@@ -1 +1 @@
-window.addEventListener("DOMContentLoaded",function(){if(document.getElementById("cookieconsent")){var e={layout:"basic",layouts:{basic:'<div class="cc-container">{{messagelink}}{{compliance}}</div>',"basic-close":'<div class="cc-container">{{messagelink}}{{compliance}}{{close}}</div>',"basic-header":'<div class="cc-container">{{header}}{{message}}{{link}}{{compliance}}</div>'},cookie:{domain:window.location.hostname,expiryDays:365},compliance:{"opt-in":'<div class="cc-compliance cc-highlight">{{deny}}{{allow}}</div>'},elements:{header:'<h2 class="cc-header">{{header}}</h2>',dismiss:'<button tabindex="0" class="cc-btn cc-dismiss">{{dismiss}}</button>',allow:'<button tabindex="0" class="cc-btn cc-allow">{{allow}}</button>'},window:'<div role="dialog" aria-label="cookieconsent" aria-describedby="cookieconsent:desc" class="cc-window {{classes}}">\x3c!--googleoff: all--\x3e{{children}}\x3c!--googleon: all--\x3e</div>',revokeBtn:'<div class="cc-revoke {{classes}}">Cookie settings</div>',content:{header:"We use cookies",message:"This website uses cookies to ensure you get the best experience on our website.",dismiss:"Got it!",allow:"Allow cookies",deny:"Decline",link:"Learn more",href:""},law:{countryCode:null,regionalLaw:!0},type:"info",position:"bottom",revokable:!1,static:!1,location:!0,showLink:!1},t=["layout","cookie.expiryDays","content.header","content.message","content.dismiss","content.allow","content.deny","content.link","content.href","type","position","law.countryCode","law.regionalLaw","revokable","static","location"],n={updateCookieConsentOptions:function(e,t,n){for(stack=t.split(".");1<stack.length;)e=e[key=stack.shift()];e[stack.shift()]=n}};for(settings=document.querySelectorAll("[data-cookieconsent-setting]"),i=0;i<settings.length;++i)setting=settings[i].dataset.cookieconsentSetting,value=settings[i].dataset.cookieconsentValue,parseInt(value,10)==value&&(value=parseInt(value,10)),-1!=t.indexOf(setting)&&(n.updateCookieConsentOptions(e,setting,value),"content.href"===setting&&n.updateCookieConsentOptions(e,"showLink",""!==value)),settings[i].parentNode.removeChild(settings[i]);delete settings,e.onPopupOpen=function(){var e=document.createEvent("Event"),e=(e.initEvent("bk2k.cookie.popupopen",!0,!0),window.dispatchEvent(e),this.options.type);"info"!=e&&"opt-out"!=e||((e=document.createEvent("Event")).initEvent("bk2k.cookie.enable",!0,!0),window.dispatchEvent(e))},e.onPopupClose=function(){var e=document.createEvent("Event");e.initEvent("bk2k.cookie.popupclose",!0,!0),window.dispatchEvent(e)},e.onInitialise=function(e){var t=this.hasConsented(),n=document.createEvent("Event");t&&(n.initEvent("bk2k.cookie.enable",!0,!0),window.dispatchEvent(n)),t||(n.initEvent("bk2k.cookie.disable",!0,!0),window.dispatchEvent(n))},e.onStatusChange=function(e,t){var n=this.options.type,o=this.hasConsented(),i=document.createEvent("Event");o&&"opt-in"==n&&(i.initEvent("bk2k.cookie.enable",!0,!0),window.dispatchEvent(i)),o||"opt-in"!=n&&"opt-out"!=n||(i.initEvent("bk2k.cookie.disable",!0,!0),window.dispatchEvent(i))},e.onRevokeChoice=function(){var e=document.createEvent("Event");e.initEvent("bk2k.cookie.revoke",!0,!0),window.dispatchEvent(e)},e.container=document.getElementById("cookieconsent"),window.cookieconsent.initialise(e)}});
\ No newline at end of file
+window.addEventListener("DOMContentLoaded",function(){if(document.getElementById("cookieconsent")){const t={layout:"basic",layouts:{basic:'<div class="cc-container">{{messagelink}}{{compliance}}</div>',"basic-close":'<div class="cc-container">{{messagelink}}{{compliance}}{{close}}</div>',"basic-header":'<div class="cc-container">{{header}}{{message}}{{link}}{{compliance}}</div>'},cookie:{domain:window.location.hostname,expiryDays:365},compliance:{"opt-in":'<div class="cc-compliance cc-highlight">{{deny}}{{allow}}</div>'},elements:{header:'<h2 class="cc-header">{{header}}</h2>',dismiss:'<button tabindex="0" class="cc-btn cc-dismiss">{{dismiss}}</button>',allow:'<button tabindex="0" class="cc-btn cc-allow">{{allow}}</button>'},window:'<div role="dialog" aria-label="cookieconsent" aria-describedby="cookieconsent:desc" class="cc-window {{classes}}">\x3c!--googleoff: all--\x3e{{children}}\x3c!--googleon: all--\x3e</div>',revokeBtn:'<div class="cc-revoke {{classes}}">Cookie settings</div>',content:{header:"We use cookies",message:"This website uses cookies to ensure you get the best experience on our website.",dismiss:"Got it!",allow:"Allow cookies",deny:"Decline",link:"Learn more",href:""},law:{countryCode:null,regionalLaw:!0},type:"info",position:"bottom",revokable:!1,static:!1,location:!0,showLink:!1},i=["layout","cookie.expiryDays","content.header","content.message","content.dismiss","content.allow","content.deny","content.link","content.href","type","position","law.countryCode","law.regionalLaw","revokable","static","location"],c={updateCookieConsentOptions:function(e,o,n){for(stack=o.split(".");1<stack.length;)e=e[key=stack.shift()];e[stack.shift()]=n}};document.querySelectorAll("[data-cookieconsent-setting]").forEach(function(e){var o=e.dataset.cookieconsentSetting;let n=e.dataset.cookieconsentValue;parseInt(n,10)==n&&(n=parseInt(n,10)),-1!=i.indexOf(o)&&(c.updateCookieConsentOptions(t,o,n),"content.href"===o&&c.updateCookieConsentOptions(t,"showLink",""!==n)),e.remove()}),t.onPopupOpen=function(){var e=new Event("bk2k.cookie.popupopen",{bubbles:!0,cancelable:!0}),e=(window.dispatchEvent(e),this.options.type);"info"!==e&&"opt-out"!==e||(e=new Event("bk2k.cookie.enable",{bubbles:!0,cancelable:!0}),window.dispatchEvent(e))},t.onPopupClose=function(){var e=new Event("bk2k.cookie.popupclose",{bubbles:!0,cancelable:!0});window.dispatchEvent(e)},t.onInitialise=function(){let e="bk2k.cookie.disable";this.hasConsented()&&(e="bk2k.cookie.enable");var o=new Event(e,{bubbles:!0,cancelable:!0});window.dispatchEvent(o)},t.onStatusChange=function(){var e,o=this.options.type,n=this.hasConsented();n&&"opt-in"===o&&(e=new Event("bk2k.cookie.enable",{bubbles:!0,cancelable:!0}),window.dispatchEvent(e)),n||"opt-in"!==o&&"opt-out"!==o||(e=new Event("bk2k.cookie.disable",{bubbles:!0,cancelable:!0}),window.dispatchEvent(e))},t.onRevokeChoice=function(){var e=new Event("bk2k.cookie.revoke",{bubbles:!0,cancelable:!0});window.dispatchEvent(e)},t.container=document.getElementById("cookieconsent"),window.cookieconsent.initialise(t)}});
\ No newline at end of file
diff --git a/Resources/Public/JavaScript/Src/bootstrap.cookieconsent.js b/Resources/Public/JavaScript/Src/bootstrap.cookieconsent.js
index 4f003aa36..44cf68004 100644
--- a/Resources/Public/JavaScript/Src/bootstrap.cookieconsent.js
+++ b/Resources/Public/JavaScript/Src/bootstrap.cookieconsent.js
@@ -2,7 +2,7 @@ window.addEventListener('DOMContentLoaded', function () {
 
     if (document.getElementById('cookieconsent')) {
         // Default Options
-        var cookieConsentOptions = {
+        const cookieConsentOptions = {
             layout: 'basic',
             layouts: {
                 'basic': '<div class="cc-container">{{messagelink}}{{compliance}}</div>',
@@ -46,7 +46,7 @@ window.addEventListener('DOMContentLoaded', function () {
         };
 
         // Supported Options
-        var cookieConsentSupportedOptions = [
+        const cookieConsentSupportedOptions = [
             'layout',
             'cookie.expiryDays',
             'content.header',
@@ -66,7 +66,7 @@ window.addEventListener('DOMContentLoaded', function () {
         ];
 
         // Functions
-        var cookieConsentFunctions = {};
+        const cookieConsentFunctions = {};
         cookieConsentFunctions.updateCookieConsentOptions = function (options, path, value) {
             stack = path.split('.');
             while (stack.length > 1) {
@@ -77,10 +77,9 @@ window.addEventListener('DOMContentLoaded', function () {
         }
 
         // Settings
-        settings = document.querySelectorAll('[data-cookieconsent-setting]');
-        for (i = 0; i < settings.length; ++i) {
-            setting = settings[i].dataset.cookieconsentSetting;
-            value = settings[i].dataset.cookieconsentValue;
+        document.querySelectorAll('[data-cookieconsent-setting]').forEach(function (element) {
+            const setting = element.dataset.cookieconsentSetting;
+            let value = element.dataset.cookieconsentValue;
             if (parseInt(value, 10) == value) {
                 value = parseInt(value, 10);
             }
@@ -98,55 +97,45 @@ window.addEventListener('DOMContentLoaded', function () {
                     );
                 }
             }
-            settings[i].parentNode.removeChild(settings[i]);
-        }
-        delete settings;
+            element.remove();
+        });
 
         // Events
         cookieConsentOptions.onPopupOpen = function () {
-            var eventOpen = document.createEvent('Event');
-            eventOpen.initEvent('bk2k.cookie.popupopen', true, true);
+            const eventOpen = new Event('bk2k.cookie.popupopen', { bubbles: true, cancelable: true });
             window.dispatchEvent(eventOpen);
-            var type = this.options.type;
-            if (type == "info" || type == "opt-out") {
-                var event = document.createEvent('Event');
-                event.initEvent('bk2k.cookie.enable', true, true);
+            const type = this.options.type;
+            if (type === "info" || type === "opt-out") {
+                const event = new Event('bk2k.cookie.enable', { bubbles: true, cancelable: true });
                 window.dispatchEvent(event);
             }
         };
-        cookieConsentOptions.onPopupClose = function () {
-            var event = document.createEvent('Event');
-            event.initEvent('bk2k.cookie.popupclose', true, true);
+        cookieConsentOptions.onPopupClose = function() {
+            const event = new Event('bk2k.cookie.popupclose', { bubbles: true, cancelable: true });
             window.dispatchEvent(event);
         };
-        cookieConsentOptions.onInitialise = function (status) {
-            var didConsent = this.hasConsented();
-            var event = document.createEvent('Event');
-            if (didConsent) {
-                event.initEvent('bk2k.cookie.enable', true, true);
-                window.dispatchEvent(event);
-            }
-            if (!didConsent) {
-                event.initEvent('bk2k.cookie.disable', true, true);
-                window.dispatchEvent(event);
+        cookieConsentOptions.onInitialise = function () {
+            let eventName = 'bk2k.cookie.disable';
+            if (this.hasConsented()) {
+                eventName = 'bk2k.cookie.enable';
             }
+            const event = new Event(eventName, { bubbles: true, cancelable: true });
+            window.dispatchEvent(event);
         };
-        cookieConsentOptions.onStatusChange = function (status, chosenBefore) {
-            var type = this.options.type;
-            var didConsent = this.hasConsented();
-            var event = document.createEvent('Event');
-            if (didConsent && type == 'opt-in') {
-                event.initEvent('bk2k.cookie.enable', true, true);
+        cookieConsentOptions.onStatusChange = function () {
+            const type = this.options.type;
+            const didConsent = this.hasConsented();
+            if (didConsent && type === 'opt-in') {
+                const event = new Event('bk2k.cookie.enable', { bubbles: true, cancelable: true });
                 window.dispatchEvent(event);
             }
-            if (!didConsent && (type == 'opt-in' || type == 'opt-out')) {
-                event.initEvent('bk2k.cookie.disable', true, true);
+            if (!didConsent && (type === 'opt-in' || type === 'opt-out')) {
+                const event = new Event('bk2k.cookie.disable', { bubbles: true, cancelable: true });
                 window.dispatchEvent(event);
             }
         };
         cookieConsentOptions.onRevokeChoice = function () {
-            var event = document.createEvent('Event');
-            event.initEvent('bk2k.cookie.revoke', true, true);
+            const event = new Event('bk2k.cookie.revoke', { bubbles: true, cancelable: true });
             window.dispatchEvent(event);
         };