diff --git a/js/faq.js b/js/faq.js
index 626aa7d..5c03333 100644
--- a/js/faq.js
+++ b/js/faq.js
@@ -53,3 +53,15 @@ document.addEventListener("DOMContentLoaded", function () {
     openFragment(event.target.location.hash);
   });
 });
+
+document.addEventListener("DOMContentLoaded", function () {
+  if (typeof _paq === "undefined") {
+    return;
+  }
+  document.querySelectorAll("aside.faq .menu-list > li > a").forEach(function (link) {
+    link.addEventListener("click", function () {
+      var linkText = link.textContent.trim();
+      _paq.push(["trackEvent", "FAQ", "Open", linkText]);
+    });
+  });
+});
diff --git a/js/modal.js b/js/modal.js
index 67228a6..be060b3 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -81,3 +81,15 @@ document.addEventListener("DOMContentLoaded", () => {
     }
   }
 });
+
+document.addEventListener("DOMContentLoaded", function () {
+  if (typeof _paq === "undefined") {
+    return;
+  }
+  document.querySelectorAll("a.open-modal").forEach(function (link) {
+    link.addEventListener("click", function () {
+      var linkText = link.textContent.trim();
+      _paq.push(["trackEvent", "Feature", "Modal", linkText]);
+    });
+  });
+});
diff --git a/theme/templates/base.html b/theme/templates/base.html
index bf53cf5..329f1a3 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -228,7 +228,6 @@
       </div>
     </footer>
     <script src="{{ SITEURL }}/theme/js/theme.min.js?v=2" defer></script>
-    {% block scripts %}{% endblock %}
     {% if MATOMO_SITE_ID %}
       <!-- Matomo -->
       <script>
@@ -259,5 +258,6 @@
       ></noscript>
       <!-- End Matomo Code -->
     {% endif %}
+    {% block scripts %}{% endblock %}
   </body>
 </html>
diff --git a/theme/templates/page-faq.html b/theme/templates/page-faq.html
index ec1908b..4d23458 100644
--- a/theme/templates/page-faq.html
+++ b/theme/templates/page-faq.html
@@ -1,4 +1,4 @@
 {% extends "page.html" %}
 {% block scripts %}
-  <script src="{{ SITEURL }}/theme/js/faq.min.js" defer></script>
+  <script src="{{ SITEURL }}/theme/js/faq.min.js?v=2" defer></script>
 {% endblock %}
diff --git a/theme/templates/page-modal.html b/theme/templates/page-modal.html
index 331d5be..2e316eb 100644
--- a/theme/templates/page-modal.html
+++ b/theme/templates/page-modal.html
@@ -1,5 +1,5 @@
 {% extends "page.html" %}
 {% block scripts %}
   <div id="modal-container"></div>
-  <script src="{{ SITEURL }}/theme/js/modal.min.js" defer></script>
+  <script src="{{ SITEURL }}/theme/js/modal.min.js?v=2" defer></script>
 {% endblock %}