diff --git a/.gitignore b/.gitignore
index fc6a7ee..13c771e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ hugo_stats.json
 
 themes/
 hugo
+node_modules/
diff --git a/assets/js/main.js b/assets/js/main.js
new file mode 100644
index 0000000..e3921c6
--- /dev/null
+++ b/assets/js/main.js
@@ -0,0 +1,17 @@
+import {MatomoLiteTracker} from "matomo-lite-tracker/src/tracker"
+import {PerformanceMetric} from "matomo-lite-tracker/src/performancetracking"
+import {BrowserFeatures} from "matomo-lite-tracker/src/browserfeatures"
+import {enableLinkTracking} from "matomo-lite-tracker/src/linktracking"
+import {isDoNotTrackEnabled} from "matomo-lite-tracker/src/util"
+
+if (!isDoNotTrackEnabled()) {
+
+    const m = new MatomoLiteTracker("https://matomo.lw1.at", 28)
+    m.performanceMetric = new PerformanceMetric()
+
+    m.browserFeatures = new BrowserFeatures()
+
+    enableLinkTracking(m, [])
+    m.trackPageview()
+}
+
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 06afba9..ed0517e 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -15,8 +15,6 @@
 {{- $sassOptions := (dict "outputStyle" "compressed" "enableSourceMap" true) }}
     {{ $style := resources.Get "sass/main.scss" | resources.ToCSS $sassOptions | resources.Fingerprint }}
     <link rel="stylesheet" href="{{ $style.Permalink }}" integrity="{{ $style.Data.Integrity }}">
-    {{ partial "matomo.html" . }}
-
 </head>
 <body>
 <main>
@@ -27,6 +25,9 @@
     <a href="https://lw1.at/i/">Privacy Policy</a>
     <a href="https://lw1.at/">My other projects</a>
 </footer>
+{{- $esBuildOptions := (dict "minify" true "sourceMap" "external") }}
+{{- $built := resources.Get "js/main.js" | js.Build $esBuildOptions | resources.Fingerprint }}
+<script src="{{ $built.RelPermalink }}" defer async integrity="{{ $built.Data.Integrity }}"></script>
 </body>
 </html>
 
diff --git a/layouts/partials/matomo.html b/layouts/partials/matomo.html
deleted file mode 100644
index fef0039..0000000
--- a/layouts/partials/matomo.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- Matomo -->
-<script type="text/javascript">
-    var _paq = window._paq || [];
-    /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-    _paq.push(["setDoNotTrack", true]);
-    _paq.push(['disableCookies']);
-    _paq.push(['trackPageView']);
-    _paq.push(['enableLinkTracking']);
-    (function () {
-        var u = "https://matomo.lw1.at/";
-        _paq.push(['setTrackerUrl', u + 'matomo.php']);
-        _paq.push(['setSiteId', '28']);
-        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 -->
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..3e08414
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,21 @@
+{
+  "name": "guides",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "guides",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "matomo-lite-tracker": "github:Findus23/MatomoLiteTracker"
+      }
+    },
+    "node_modules/matomo-lite-tracker": {
+      "version": "1.0.0",
+      "resolved": "git+ssh://git@github.com/Findus23/MatomoLiteTracker.git#eda41aac10eeb3643ceb0cfb0b5a5e91a8d1bbd5",
+      "license": "BSD-3-Clause"
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..4fc012d
--- /dev/null
+++ b/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "guides",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Findus23/guides.git"
+  },
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/Findus23/guides/issues"
+  },
+  "homepage": "https://github.com/Findus23/guides#readme",
+  "dependencies": {
+    "matomo-lite-tracker": "github:Findus23/MatomoLiteTracker"
+  }
+}
