diff --git a/distros/dataverse.no/modification/analytics.xhtml b/distros/dataverse.no/modification/analytics.xhtml
index d0bcdfa..a9d644b 100644
--- a/distros/dataverse.no/modification/analytics.xhtml
+++ b/distros/dataverse.no/modification/analytics.xhtml
@@ -1,303 +1,24 @@
+
 <script type="text/javascript">
     var _paq = window._paq || [];
     /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
     _paq.push(['setDownloadClasses', "btn-download"]);
     _paq.push(['trackPageView']);
     _paq.push(['enableLinkTracking']);
-    (function() {
-      var u="//www.ub.uit.no/matomo/";
-      _paq.push(['setTrackerUrl', u+'matomo.php']);
-      _paq.push(['setSiteId', '6']);
-      var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-      g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+    (function () {
+        var u = "https://www.ub.uit.no/matomo/";
+        _paq.push(['setTrackerUrl', u + 'matomo.php']);
+        _paq.push(['setSiteId', '6']);
+        var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+        g.type = 'text/javascript'; g.async = true; g.defer = true; g.src = u + 'matomo.js'; s.parentNode.insertBefore(g, s);
     })();
-  </script>
-  <!-- End Matomo Code -->
-  
-  <noscript>
-  <!-- Matomo Image Tracker-->
-  <img src="https://www.ub.uit.no/matomo/matomo.php?idsite=6&amp;rec=1" style="border:0" alt="" />
-  <!-- End Matomo -->
-  </noscript>
-  
-  <style>
-      #dvfooter button#tracking-manager {
-          background: none;
-          border: none;
-          color: #337ab7;
-      }
-      #dvfooter button#tracking-manager:hover {
-          cursor: pointer;
-          text-decoration: underline;
-      }
-      #dvfooter #tracking-modal {
-          visibility: hidden;
-          position: fixed;
-          left: 0;
-          top: 0;
-          width: 100%;
-          height: 100%;
-          overflow: auto;
-          background-color: rgb(0, 0, 0);
-          background-color: rgba(0, 0, 0, 0.5);
-          opacity: 0;
-          transform: scale(1.1);
-          transition: visibility 0s linear 0.25s, opacity 0.25s 0s, transform 0.25s;
-          z-index: 1000;
-      }
-      #dvfooter #tracking-modal.show-modal {
-          opacity: 1;
-          visibility: visible;
-          transform: scale(1.0);
-          transition: visibility 0s linear 0s, opacity 0.25s 0s, transform 0.25s;
-      }
-      #dvfooter #tracking-modal .modal-content {
-          position: absolute;
-          top: 50%;
-          left: 50%;
-          background-color: #fefefe;
-          padding: 20px;
-          border: 1px solid #888;
-          width: 80%;
-          box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-          transform: translate(-50%, -50%);
-      }
-      #dvfooter #tracking-modal .modal-content .modal-header {
-          padding: 2px 16px;
-      }
-      #dvfooter #tracking-modal .modal-content .modal-header .close {
-          color: black;
-          cursor: pointer;
-          float: right;
-          font-size: 28px;
-          font-weight: bold;
-      }
-      #dvfooter #tracking-modal .modal-content .modal-header .close:hover,
-      #dvfooter #tracking-modal .modal-content .modal-header .close:focus {
-          color: black;
-          text-decoration: none;
-      }
-      #dvfooter #tracking-modal .modal-content .modal-body {
-          border-top: 1px solid #e0e0e0;
-          padding: 10px 16px;
-      }
-      #dvfooter #tracking-modal .modal-content .modal-body iframe {
-          border: 0;
-          width: 100%;
-      }
-      #dvfooter #tracking-modal .modal-content .modal-body span,
-      #dvfooter #tracking-modal .modal-content .modal-body #text-load-error div {
-          margin-top: 1em;
-          white-space: pre-wrap;
-      }
-      #dvfooter #tracking-modal .modal-content .modal-body label {
-          display: block;
-          font-weight: bold;
-          padding-top: 15px;
-      }
-      #dvfooter #tracking-modal .modal-content .modal-body label input#track-visits {
-          margin-right: 10px;
-      }
-  </style>
-  <script>
-      "use strict";
-      (() => {
-          const modalTrackingLabels = {
-              "en": {
-                  "title": "Manage tracking",
-                  "load-error": "The user analysis module did not load properly.\nPlease reload the page later, or check if a tool integrated to your browser does not prevent the module loading.",
-                  "load-error-more-infos": "You may find find more informations about our user analytics in our",
-                  "load-error-more-infos-link": "https://site.uit.no/dataverseno/about/policy-framework/access-and-use-policy/",
-                  "load-error-more-infos-link-text": "Privacy policy",
-                  "dnt": "We have considered your browser settings. Your visits to this web site will not be recorded by our web analysis tool.\nIf you wish to allow tracking, please remove the \"Do Not Track\" setting from your browser.",
-                  "opt-in": "Opt-out cookie installed. Your visits to this web site will not be recorded by our web analytics tool.\nNote: if you clean up your cookies and delete the opt-out cookie, or if you change your computer and/or browser, you will need to perform the opt-out procedure again.",
-                  "checkbox-opt-in": "You are not currently being tracked. Check this box to stop being excluded.",
-                  "opt-out": "You may opt-out of having your browsing on this site tracked.\nThis will also prevent DataverseNO from learning about your actions and creating a better experience for you and other users.",
-                  "checkbox-opt-out": "You are not opted out. Uncheck this box to opt-out.",
-              },
-          }
-  
-          function createModalMatomo(lang) {
-              const modal = document.createElement("div");
-              modal.className = "tracking-modal";
-              modal.id = "tracking-modal";
-  
-              const modalContent = document.createElement("div");
-              modalContent.className = "modal-content";
-              modal.appendChild(modalContent);
-  
-              const modalContentHeader = document.createElement("div");
-              modalContentHeader.className = "modal-header";
-              modalContent.appendChild(modalContentHeader);
-  
-              const modalContentHeaderClose = document.createElement("span");
-              modalContentHeaderClose.className = "close";
-              modalContentHeaderClose.innerHTML = "&times;";
-              modalContentHeader.appendChild(modalContentHeaderClose);
-  
-              const modalContentHeaderTitle = document.createElement("h2");
-              modalContentHeaderTitle.textContent = modalTrackingLabels[lang]["title"];
-              modalContentHeader.appendChild(modalContentHeaderTitle);
-  
-              const modalContentBody = document.createElement("div");
-              modalContentBody.className = "modal-body";
-              modalContent.appendChild(modalContentBody);
-  
-              const modalContentBodyNoScript = document.createElement("noscript");
-              modalContentBody.appendChild(modalContentBodyNoScript);
-  
-              const modalContentBodyIframe = document.createElement("iframe");
-              modalContentBodyIframe.src = "https://www.ub.uit.no/matomo/index.php?module=CoreAdminHome&action=optOut&language=en&backgroundColor=ffffff&fontColor=000000&fontFamily=sans-serif";
-              modalContentBodyNoScript.appendChild(modalContentBodyIframe);
-  
-              const modalContentBodyBodyLoadError = document.createElement("div");
-              modalContentBodyBodyLoadError.id = "text-load-error";
-  
-              const modalContentBodyTextLoadError = document.createElement("span");
-              modalContentBodyTextLoadError.textContent = modalTrackingLabels[lang]["load-error"];
-              modalContentBodyBodyLoadError.appendChild(modalContentBodyTextLoadError);
-  
-              const modalContentBodyMoreInfosLoadError = document.createElement("div");
-              const loadErrorMoreInfos = modalTrackingLabels[lang]["load-error-more-infos"];
-              modalContentBodyMoreInfosLoadError.textContent = loadErrorMoreInfos.endsWith(" ") ? loadErrorMoreInfos : `${loadErrorMoreInfos} `;
-              const modalContentBodyMoreInfosLinkLoadError = document.createElement("a");
-              modalContentBodyMoreInfosLinkLoadError.href = modalTrackingLabels[lang]["load-error-more-infos-link"];
-              modalContentBodyMoreInfosLinkLoadError.title = modalTrackingLabels[lang]["load-error-more-infos-link-text"];
-              modalContentBodyMoreInfosLinkLoadError.textContent = modalTrackingLabels[lang]["load-error-more-infos-link-text"];
-              modalContentBodyMoreInfosLinkLoadError.target = "_blank";
-              modalContentBodyMoreInfosLoadError.appendChild(modalContentBodyMoreInfosLinkLoadError);
-              modalContentBodyBodyLoadError.appendChild(modalContentBodyMoreInfosLoadError);
-  
-              modalContentBody.appendChild(modalContentBodyBodyLoadError);
-              const modalContentBodyTextDnT = document.createElement("span");
-              modalContentBodyTextDnT.id = "text-dnt";
-              modalContentBodyTextDnT.classList.add("hidden");
-              modalContentBodyTextDnT.textContent = modalTrackingLabels[lang]["dnt"];
-              modalContentBody.appendChild(modalContentBodyTextDnT);
-  
-              const modalContentBodyTextOptIn = document.createElement("span");
-              modalContentBodyTextOptIn.id = "text-opt-in";
-              modalContentBodyTextOptIn.classList.add("hidden");
-              modalContentBodyTextOptIn.textContent = modalTrackingLabels[lang]["opt-in"];
-              modalContentBody.appendChild(modalContentBodyTextOptIn);
-  
-              const modalContentBodyTextOptOut = document.createElement("span");
-              modalContentBodyTextOptOut.id = "text-opt-out";
-              modalContentBodyTextOptOut.classList.add("hidden");
-              modalContentBodyTextOptOut.textContent = modalTrackingLabels[lang]["opt-out"];
-              modalContentBody.appendChild(modalContentBodyTextOptOut);
-  
-              const modalContentBodyForm = document.createElement("label");
-              modalContentBodyForm.setAttribute("for", "track-visits");
-              modalContentBody.appendChild(modalContentBodyForm);
-  
-              const modalContentBodyFormInput = document.createElement("input");
-              modalContentBodyFormInput.id = "track-visits";
-              modalContentBodyFormInput.classList.add("hidden");
-              modalContentBodyFormInput.setAttribute("type", "checkbox");
-              modalContentBodyFormInput.setAttribute("name", "track-visits");
-              modalContentBodyForm.appendChild(modalContentBodyFormInput);
-  
-              const modalContentBodyFormOptIn = document.createElement("span");
-              modalContentBodyFormOptIn.id = "label-opt-in";
-              modalContentBodyFormOptIn.classList.add("hidden");
-              modalContentBodyFormOptIn.textContent = modalTrackingLabels[lang]["checkbox-opt-in"];
-              modalContentBodyForm.appendChild(modalContentBodyFormOptIn);
-  
-              const modalContentBodyFormOptOut = document.createElement("span");
-              modalContentBodyFormOptOut.id = "label-opt-out";
-              modalContentBodyFormOptOut.classList.add("hidden");
-              modalContentBodyFormOptOut.textContent = modalTrackingLabels[lang]["checkbox-opt-out"];
-              modalContentBodyForm.appendChild(modalContentBodyFormOptOut);
-  
-              document.querySelector("#dvfooter").insertAdjacentElement("beforeend", modal);
-          }
-  
-          addEventListener("DOMContentLoaded", (event) => {
-              let lang = document.querySelector("html").getAttribute("lang");
-              if (!lang) {
-                  lang = "en"
-              }
-              createModalMatomo(lang);
-  
-              const modal = document.getElementById("tracking-modal");
-              const trigger = document.getElementById("tracking-manager");
-              const closeButton = modal.querySelector(".close");
-  
-              function toggleModal() {
-                  modal.classList.toggle("show-modal");
-              }
-  
-              function windowOnClick(event) {
-                  if (event.target === modal) {
-                      toggleModal();
-                  }
-              }
-  
-              function setOptOutText(element) {
-                  _paq.push([function() {
-                      const textLoadError = document.getElementById("text-load-error");
-                      const textOptIn = document.getElementById("text-opt-in");
-                      const textOptOut = document.getElementById("text-opt-out");
-                      const labelOptIn = document.getElementById("label-opt-in");
-                      const labelOptOut = document.getElementById("label-opt-out");
-                      if (!textLoadError.classList.contains("hidden")) {
-                          textLoadError.classList.add("hidden");
-                          document.getElementById("track-visits").classList.remove("hidden");
-                      }
-                      if (this.isUserOptedOut()) {
-                          element.checked = false;
-                          if (!textOptOut.classList.contains("hidden")) {
-                              textOptOut.classList.add("hidden");
-                          }
-                          if (!labelOptOut.classList.contains("hidden")) {
-                              labelOptOut.classList.add("hidden");
-                          }
-                          if (textOptIn.classList.contains("hidden")) {
-                              textOptIn.classList.remove("hidden");
-                          }
-                          if (labelOptIn.classList.contains("hidden")) {
-                              labelOptIn.classList.remove("hidden");
-                          }
-                      } else {
-                          element.checked = true;
-                          if (textOptOut.classList.contains("hidden")) {
-                              textOptOut.classList.remove("hidden");
-                          }
-                          if (labelOptOut.classList.contains("hidden")) {
-                              labelOptOut.classList.remove("hidden");
-                          }
-                          if (!textOptIn.classList.contains("hidden")) {
-                              textOptIn.classList.add("hidden");
-                          }
-                          if (!labelOptIn.classList.contains("hidden")) {
-                              labelOptIn.classList.add("hidden");
-                          }
-                      }
-                  }]);
-              }
-  
-              const checkbox = document.getElementById("track-visits");
-              if (navigator.doNotTrack === "yes" || navigator.doNotTrack === "1") {
-                  document.getElementById("text-dnt").classList.remove("hidden");
-                  document.getElementById("text-load-error").classList.add("hidden");
-                  checkbox.classList.add("hidden");
-              } else {
-                  checkbox.addEventListener("click", function() {
-                      if (this.checked) {
-                          _paq.push(['forgetUserOptOut']);
-                      } else {
-                          _paq.push(['optUserOut']);
-                      }
-                      setOptOutText(checkbox);
-                  });
-                  setOptOutText(checkbox);
-              }
-  
-              trigger.addEventListener("click", toggleModal);
-              closeButton.addEventListener("click", toggleModal);
-              window.addEventListener("click", windowOnClick);
-          });
-      })();
-  </script>
-  
\ No newline at end of file
+
+    
+</script>
+<!-- End Matomo Code -->
+
+<noscript>
+    <!-- Matomo Image Tracker-->
+    <img src="https://www.ub.uit.no/matomo/matomo.php?idsite=6&amp;rec=1" style="border:0" alt="" />
+    <!-- End Matomo -->
+</noscript>
diff --git a/distros/dataverse.no/modification/dataverse_footer.xhtml b/distros/dataverse.no/modification/dataverse_footer.xhtml
index d8b625b..087ae50 100644
--- a/distros/dataverse.no/modification/dataverse_footer.xhtml
+++ b/distros/dataverse.no/modification/dataverse_footer.xhtml
@@ -1,87 +1,178 @@
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:h="http://java.sun.com/jsf/html"
-                xmlns:f="http://java.sun.com/jsf/core"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:p="http://primefaces.org/ui"
-                xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
-                xmlns:jsf="http://xmlns.jcp.org/jsf"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
-                xmlns:o="http://omnifaces.org/ui"
-                xmlns:of="http://omnifaces.org/functions"
-                xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-    <div id="dataverseFooter" jsf:rendered="#{!widgetView and !dataverseHeaderFragment.isRootDataverseThemeDisabled(dataverse) and !empty dataverse.dataverseTheme.logoFooter}">
-        <div class="container">
-            <div class="row">
-                <div class="dataverseFooterLogo col-xs-12" style="text-align:#{!empty dataverse.dataverseTheme.logoFooterAlignment ? dataverse.dataverseTheme.logoFooterAlignment : 'center'};background:##{!empty dataverse.dataverseTheme.logoFooterBackgroundColor ? dataverse.dataverseTheme.logoFooterBackgroundColor : 'FFFFFF'};">
-                    <img src="/logos/#{dataverse.logoOwnerId}/#{dataverse.dataverseTheme.logoFooter}" alt="#{of:format1(bundle['alt.logo'], dataverse.name)}"/>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div id="footer" class="#{widgetView ? 'widget-view' : ''}">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-8 small" jsf:rendered="#{!widgetView}">
-                    <p>
+<style>
+    /* NOTE: You can use the custom CSS configuration to move this CSS your own stylesheet. */
+
+    /* Overwrite default footer styles to make room at the bottom of the browser page for our custom footer... */
+    html,
+    body {
+        height: 100%;
+    }
+
+    #content.container {
+        min-height: calc(100% - 210px);
+        margin-bottom: -142px;
+    }
+
+    #content.container:after {
+        content: "";
+        display: block;
+    }
 
+    #footer {
+        color: #a9a9a9;
+        margin-top: 0px;
+        padding-bottom: 0px;
+        bottom: -130px;
+        position: relative;
+    }
 
-<!-- UB: Add Provider here-->
-<p> </p>
-DataverseNO is a national research data repository <br>provided by <a href="https://uit.no" target="_blank">UiT The Arctic University of Norway </a></br>
-in cooperation with its <a href="https://site.uit.no/dataverseno/support/" target="_blank">partner institutions </a><p></p>
+    /* Place custom footer just above default footer at the bottom of the page... */
+    #custom-footer,
+    #content.container:after {
+        height: 142px;
+    }
 
+    #custom-footer {
+        color: #a9a9a9;
+        min-height: 100px;
+        padding: 1.25em 0 100px 0;
+    }
 
-<a href="https://site.uit.no/dataverseno/about/" target="_blank">About DataverseNO</a> | <a href="https://site.uit.no/dataverseno/support/" target="_blank">Contact </a> | <a href="https://uustatus.no/nn/erklaringer/publisert/8374ca6b-85e3-4b4c-9d8e-56d37d9b0088" target="_blank">Tilgjengelegheitserklæring (Accessibility Statement)</a>
+    #dvfooter button#tracking-manager {
+        background: none;
+        border: none;
+        color: #337ab7;
+    }
 
+    #dvfooter button#tracking-manager:hover {
+        cursor: pointer;
+        text-decoration: underline;
+    }
 
+    #dvfooter #tracking-modal {
+        visibility: hidden;
+        position: fixed;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        overflow: auto;
+        background-color: rgb(0, 0, 0);
+        background-color: rgba(0, 0, 0, 0.5);
+        opacity: 0;
+        transform: scale(1.1);
+        transition: visibility 0s linear 0.25s, opacity 0.25s 0s, transform 0.25s;
+        z-index: 1000;
+    }
 
-<!-- end add this here -->
-<p> </p>
+    #dvfooter #tracking-modal.show-modal {
+        opacity: 1;
+        visibility: visible;
+        transform: scale(1.0);
+        transition: visibility 0s linear 0s, opacity 0.25s 0s, transform 0.25s;
+    }
 
+    #dvfooter #tracking-modal .modal-content {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        background-color: #fefefe;
+        padding: 20px;
+        border: 1px solid #888;
+        width: 80%;
+        box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+        transform: translate(-50%, -50%);
+    }
 
-                        <a href="https://dataverse.org/" title="#{bundle['footer.dataverseProject']}" target="_blank" rel="noopener"><img src="/resources/images/dataverse_project_logo.svg" width="118" height="40" onerror="this.src='/resources/images/dataverseproject_logo.png'" alt="#{of:format1(bundle['alt.logo'], bundle['footer.dataverseProject'])}"/></a>
-                        <h:outputText class="version" value="v. #{systemConfig.getVersion(true)}" rendered="#{!widgetView}"/>
+    #dvfooter #tracking-modal .modal-content .modal-header {
+        padding: 2px 16px;
+    }
 
+    #dvfooter #tracking-modal .modal-content .modal-header .close {
+        color: black;
+        cursor: pointer;
+        float: right;
+        font-size: 28px;
+        font-weight: bold;
+    }
 
+    #dvfooter #tracking-modal .modal-content .modal-header .close:hover,
+    #dvfooter #tracking-modal .modal-content .modal-header .close:focus {
+        color: black;
+        text-decoration: none;
+    }
+
+    #dvfooter #tracking-modal .modal-content .modal-body {
+        border-top: 1px solid #e0e0e0;
+        padding: 10px 16px;
+    }
+
+    #dvfooter #tracking-modal .modal-content .modal-body iframe {
+        border: 0;
+        width: 100%;
+    }
+
+    #dvfooter #tracking-modal .modal-content .modal-body span,
+    #dvfooter #tracking-modal .modal-content .modal-body #text-load-error div {
+        margin-top: 1em;
+        white-space: pre-wrap;
+    }
+
+    #dvfooter #tracking-modal .modal-content .modal-body label {
+        display: block;
+        font-weight: bold;
+        padding-top: 15px;
+    }
+
+    #dvfooter #tracking-modal .modal-content .modal-body label input#track-visits {
+        margin-right: 10px;
+    }
+</style>
+
+<div id="custom-footer">
+    <div class="container">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-8 small">
+                    <p>
+
+
+
+                    <p> </p>
+                    DataverseNO is a national research data repository <br>provided by <a href="https://uit.no"
+                        target="_blank">UiT The Arctic University of Norway </a></br>
+                    in cooperation with its <a href="https://site.uit.no/dataverseno/support/" target="_blank">partner
+                        institutions </a>
+                    <p></p>
+
+
+                    <a href="https://site.uit.no/dataverseno/about/" target="_blank">About DataverseNO</a> | <a
+                        href="https://site.uit.no/dataverseno/support/" target="_blank">Contact </a> | <a
+                        href="https://uustatus.no/nn/erklaringer/publisert/8374ca6b-85e3-4b4c-9d8e-56d37d9b0088"
+                        target="_blank">Tilgjengelegheitserklæring (Accessibility Statement)</a>
+
+
+
+                    <p> </p>
 
-<!-- UB: Remove showing of  copyright and year -->
-<!--
 
 
 
-                        <h:outputText value="#{systemConfig.footerCopyrightAndYear}#{settingsWrapper.get(':FooterCopyright')}" escape="false"/> <ui:fragment rendered="#{!empty settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}">&#160;|&#160; <h:outputLink value="#{settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}" target="_blank" rel="noopener">#{bundle['footer.privacyPolicy']}</h:outputLink></ui:fragment>
 
--->
                     </p>
                 </div>
-                <div class="col-xs-7 small" jsf:rendered="#{widgetView}">
-                    <span class="widgetBrandMsg">
-                        <h:outputFormat value="#{bundle['footer.widget.datastored']}" escape="false">
-                            <o:param>
-                                <a href="/" target="_blank" rel="noopener" title="#{dataverseServiceBean.findRootDataverse().displayName}">#{dataverseServiceBean.findRootDataverse().displayName}</a>
-                            </o:param>
-                        </h:outputFormat>
-                        <ui:fragment rendered="#{!dataverseSession.user.authenticated}">
-                            <h:outputLink styleClass="margin-sides highlightBold" value="/loginpage.xhtml?#{loginRedirectPage}" target="_blank" rel="noopener" title="#{bundle['footer.widget.login']} #{dataverseServiceBean.findRootDataverse().displayName}">
-                                #{bundle.login}
-                            </h:outputLink>
-                        </ui:fragment>
-                    </span>
-                </div>
-                <div class="#{widgetView ? 'col-xs-5' : 'col-sm-4'} text-right">
+                <div class="col-sm-4 text-right">
                     <div class="poweredbylogo">
-<!-- UB
-                        <span>#{bundle['footer.poweredby']}</span>
-                        <a href="https://dataverse.org/" title="#{bundle['footer.dataverseProject']}" target="_blank" rel="noopener"><img src="/resources/images/dataverse_project_logo.svg" width="118" height="40" onerror="this.src='/resources/images/dataverseproject_logo.png'" alt="#{of:format1(bundle['alt.logo'], bundle['footer.dataverseProject'])}"/></a>
-                        <h:outputText class="version" value="v. #{systemConfig.getVersion(true)}" rendered="#{!widgetView}"/>
--->
 
 
- <a href="https://www.coretrustseal.org/why-certification/certified-repositories/" target="_blank"> <img src="https://www.ub.uit.no/dataverse/cts_footer.png" alt="Core Certified Repositories" /> </a>
-<!--Core Certified Repositories logo -->
-<!-- UB: Add re3data logo here-->
-<br> <a href="https://www.re3data.org/repository/r3d100012538" target="_blank"> <img src="https://www.ub.uit.no/dataverse/re3data.jpg" alt="re3data" /> </a> </br>
-<!-- end of re3data logo -->
+
+                        <a href="https://www.coretrustseal.org/why-certification/certified-repositories/"
+                            target="_blank"> <img src="https://www.ub.uit.no/dataverse/cts_footer.png"
+                                alt="Core Certified Repositories" /> </a>
+
+
+                        <br> <a href="https://www.re3data.org/repository/r3d100012538" target="_blank"> <img
+                                src="https://www.ub.uit.no/dataverse/re3data.jpg" alt="re3data" /> </a> </br>
+
 
 
                     </div>
@@ -89,5 +180,208 @@ in cooperation with its <a href="https://site.uit.no/dataverseno/support/" targe
             </div>
         </div>
     </div>
-    <o:resourceInclude path="/CustomizationFilesServlet?customFileType=footer" rendered="#{!widgetView}"/>
-</ui:composition>
+</div>
+
+<script type="text/javascript">
+    //<![CDATA[
+    "use strict";
+    (() => {
+        const modalTrackingLabels = {
+            "en": {
+                "title": "Manage tracking",
+                "load-error": "The user analysis module did not load properly.\nPlease reload the page later, or check if a tool integrated to your browser does not prevent the module loading.",
+                "load-error-more-infos": "You may find find more informations about our user analytics in our",
+                "load-error-more-infos-link": "https://site.uit.no/dataverseno/about/policy-framework/access-and-use-policy/",
+                "load-error-more-infos-link-text": "Privacy policy",
+                "dnt": "We have considered your browser settings. Your visits to this web site will not be recorded by our web analysis tool.\nIf you wish to allow tracking, please remove the \"Do Not Track\" setting from your browser.",
+                "opt-in": "Opt-out cookie installed. Your visits to this web site will not be recorded by our web analytics tool.\nNote: if you clean up your cookies and delete the opt-out cookie, or if you change your computer and/or browser, you will need to perform the opt-out procedure again.",
+                "checkbox-opt-in": "You are not currently being tracked. Check this box to stop being excluded.",
+                "opt-out": "You may opt-out of having your browsing on this site tracked.\nThis will also prevent DataverseNO from learning about your actions and creating a better experience for you and other users.",
+                "checkbox-opt-out": "You are not opted out. Uncheck this box to opt-out.",
+            },
+        }
+
+        function createModalMatomo(lang) {
+            const modal = document.createElement("div");
+            modal.className = "tracking-modal";
+            modal.id = "tracking-modal";
+
+            const modalContent = document.createElement("div");
+            modalContent.className = "modal-content";
+            modal.appendChild(modalContent);
+
+            const modalContentHeader = document.createElement("div");
+            modalContentHeader.className = "modal-header";
+            modalContent.appendChild(modalContentHeader);
+
+            const modalContentHeaderClose = document.createElement("span");
+            modalContentHeaderClose.className = "close";
+            modalContentHeaderClose.innerHTML = "&times;";
+            modalContentHeader.appendChild(modalContentHeaderClose);
+
+            const modalContentHeaderTitle = document.createElement("h2");
+            modalContentHeaderTitle.textContent = modalTrackingLabels[lang]["title"];
+            modalContentHeader.appendChild(modalContentHeaderTitle);
+
+            const modalContentBody = document.createElement("div");
+            modalContentBody.className = "modal-body";
+            modalContent.appendChild(modalContentBody);
+
+            const modalContentBodyNoScript = document.createElement("noscript");
+            modalContentBody.appendChild(modalContentBodyNoScript);
+
+            const modalContentBodyIframe = document.createElement("iframe");
+            modalContentBodyIframe.src = "https://www.ub.uit.no/matomo/index.php?module=CoreAdminHome&action=optOut&language=en&backgroundColor=ffffff&fontColor=000000&fontFamily=sans-serif";
+            modalContentBodyNoScript.appendChild(modalContentBodyIframe);
+
+            const modalContentBodyBodyLoadError = document.createElement("div");
+            modalContentBodyBodyLoadError.id = "text-load-error";
+
+            const modalContentBodyTextLoadError = document.createElement("span");
+            modalContentBodyTextLoadError.textContent = modalTrackingLabels[lang]["load-error"];
+            modalContentBodyBodyLoadError.appendChild(modalContentBodyTextLoadError);
+
+            const modalContentBodyMoreInfosLoadError = document.createElement("div");
+            const loadErrorMoreInfos = modalTrackingLabels[lang]["load-error-more-infos"];
+            modalContentBodyMoreInfosLoadError.textContent = loadErrorMoreInfos.endsWith(" ") ? loadErrorMoreInfos : `${loadErrorMoreInfos} `;
+            const modalContentBodyMoreInfosLinkLoadError = document.createElement("a");
+            modalContentBodyMoreInfosLinkLoadError.href = modalTrackingLabels[lang]["load-error-more-infos-link"];
+            modalContentBodyMoreInfosLinkLoadError.title = modalTrackingLabels[lang]["load-error-more-infos-link-text"];
+            modalContentBodyMoreInfosLinkLoadError.textContent = modalTrackingLabels[lang]["load-error-more-infos-link-text"];
+            modalContentBodyMoreInfosLinkLoadError.target = "_blank";
+            modalContentBodyMoreInfosLoadError.appendChild(modalContentBodyMoreInfosLinkLoadError);
+            modalContentBodyBodyLoadError.appendChild(modalContentBodyMoreInfosLoadError);
+
+            modalContentBody.appendChild(modalContentBodyBodyLoadError);
+            const modalContentBodyTextDnT = document.createElement("span");
+            modalContentBodyTextDnT.id = "text-dnt";
+            modalContentBodyTextDnT.classList.add("hidden");
+            modalContentBodyTextDnT.textContent = modalTrackingLabels[lang]["dnt"];
+            modalContentBody.appendChild(modalContentBodyTextDnT);
+
+            const modalContentBodyTextOptIn = document.createElement("span");
+            modalContentBodyTextOptIn.id = "text-opt-in";
+            modalContentBodyTextOptIn.classList.add("hidden");
+            modalContentBodyTextOptIn.textContent = modalTrackingLabels[lang]["opt-in"];
+            modalContentBody.appendChild(modalContentBodyTextOptIn);
+
+            const modalContentBodyTextOptOut = document.createElement("span");
+            modalContentBodyTextOptOut.id = "text-opt-out";
+            modalContentBodyTextOptOut.classList.add("hidden");
+            modalContentBodyTextOptOut.textContent = modalTrackingLabels[lang]["opt-out"];
+            modalContentBody.appendChild(modalContentBodyTextOptOut);
+
+            const modalContentBodyForm = document.createElement("label");
+            modalContentBodyForm.setAttribute("for", "track-visits");
+            modalContentBody.appendChild(modalContentBodyForm);
+
+            const modalContentBodyFormInput = document.createElement("input");
+            modalContentBodyFormInput.id = "track-visits";
+            modalContentBodyFormInput.classList.add("hidden");
+            modalContentBodyFormInput.setAttribute("type", "checkbox");
+            modalContentBodyFormInput.setAttribute("name", "track-visits");
+            modalContentBodyForm.appendChild(modalContentBodyFormInput);
+
+            const modalContentBodyFormOptIn = document.createElement("span");
+            modalContentBodyFormOptIn.id = "label-opt-in";
+            modalContentBodyFormOptIn.classList.add("hidden");
+            modalContentBodyFormOptIn.textContent = modalTrackingLabels[lang]["checkbox-opt-in"];
+            modalContentBodyForm.appendChild(modalContentBodyFormOptIn);
+
+            const modalContentBodyFormOptOut = document.createElement("span");
+            modalContentBodyFormOptOut.id = "label-opt-out";
+            modalContentBodyFormOptOut.classList.add("hidden");
+            modalContentBodyFormOptOut.textContent = modalTrackingLabels[lang]["checkbox-opt-out"];
+            modalContentBodyForm.appendChild(modalContentBodyFormOptOut);
+
+            document.querySelector("#dvfooter").insertAdjacentElement("beforeend", modal);
+        }
+
+        addEventListener("DOMContentLoaded", (event) => {
+            let lang = document.querySelector("html").getAttribute("lang");
+            if (!lang) {
+                lang = "en"
+            }
+            createModalMatomo(lang);
+
+            const modal = document.getElementById("tracking-modal");
+            const trigger = document.getElementById("tracking-manager");
+            const closeButton = modal.querySelector(".close");
+
+            function toggleModal() {
+                modal.classList.toggle("show-modal");
+            }
+
+            function windowOnClick(event) {
+                if (event.target === modal) {
+                    toggleModal();
+                }
+            }
+
+            function setOptOutText(element) {
+                _paq.push([function() {
+                    const textLoadError = document.getElementById("text-load-error");
+                    const textOptIn = document.getElementById("text-opt-in");
+                    const textOptOut = document.getElementById("text-opt-out");
+                    const labelOptIn = document.getElementById("label-opt-in");
+                    const labelOptOut = document.getElementById("label-opt-out");
+                    if (!textLoadError.classList.contains("hidden")) {
+                        textLoadError.classList.add("hidden");
+                        document.getElementById("track-visits").classList.remove("hidden");
+                    }
+                    if (this.isUserOptedOut()) {
+                        element.checked = false;
+                        if (!textOptOut.classList.contains("hidden")) {
+                            textOptOut.classList.add("hidden");
+                        }
+                        if (!labelOptOut.classList.contains("hidden")) {
+                            labelOptOut.classList.add("hidden");
+                        }
+                        if (textOptIn.classList.contains("hidden")) {
+                            textOptIn.classList.remove("hidden");
+                        }
+                        if (labelOptIn.classList.contains("hidden")) {
+                            labelOptIn.classList.remove("hidden");
+                        }
+                    } else {
+                        element.checked = true;
+                        if (textOptOut.classList.contains("hidden")) {
+                            textOptOut.classList.remove("hidden");
+                        }
+                        if (labelOptOut.classList.contains("hidden")) {
+                            labelOptOut.classList.remove("hidden");
+                        }
+                        if (!textOptIn.classList.contains("hidden")) {
+                            textOptIn.classList.add("hidden");
+                        }
+                        if (!labelOptIn.classList.contains("hidden")) {
+                            labelOptIn.classList.add("hidden");
+                        }
+                    }
+                }]);
+            }
+
+            const checkbox = document.getElementById("track-visits");
+            if (navigator.doNotTrack === "yes" || navigator.doNotTrack === "1") {
+                document.getElementById("text-dnt").classList.remove("hidden");
+                document.getElementById("text-load-error").classList.add("hidden");
+                checkbox.classList.add("hidden");
+            } else {
+                checkbox.addEventListener("click", function() {
+                    if (this.checked) {
+                        _paq.push(['forgetUserOptOut']);
+                    } else {
+                        _paq.push(['optUserOut']);
+                    }
+                    setOptOutText(checkbox);
+                });
+                setOptOutText(checkbox);
+            }
+
+            trigger.addEventListener("click", toggleModal);
+            closeButton.addEventListener("click", toggleModal);
+            window.addEventListener("click", windowOnClick);
+        });
+    })();
+    //]]>
+</script>