diff --git a/templates/404.html b/templates/404.html
index 995bba8..7439481 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -30,21 +30,7 @@
     <link rel="stylesheet" href="/assets/css/404.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body><!-- partial:index.partial -->
diff --git a/templates/about.html b/templates/about.html
index 812b8f7..dcb2dba 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -29,23 +29,10 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="/assets/fonts/fontawesome-all.min.css">
     <link rel="stylesheet" href="/assets/fonts/ionicons.min.css">
+    <link rel="stylesheet" href="/assets/fonts/simple-line-icons.min.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/assets/img/avatars/erwin.groen.jpg b/templates/assets/img/avatars/erwin.groen.jpg
new file mode 100644
index 0000000..d6bef45
Binary files /dev/null and b/templates/assets/img/avatars/erwin.groen.jpg differ
diff --git a/templates/assets/img/avatars/nathan.woodburn.jpg b/templates/assets/img/avatars/nathan.woodburn.jpg
new file mode 100644
index 0000000..fa21ecb
Binary files /dev/null and b/templates/assets/img/avatars/nathan.woodburn.jpg differ
diff --git a/templates/blog.html b/templates/blog.html
index edf10d2..04b20ed 100644
--- a/templates/blog.html
+++ b/templates/blog.html
@@ -29,21 +29,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/blog/happening.html b/templates/blog/happening.html
index 17a99e9..d11e3fb 100644
--- a/templates/blog/happening.html
+++ b/templates/blog/happening.html
@@ -29,21 +29,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/blog/new_domains.html b/templates/blog/new_domains.html
index 031b9ec..139c129 100644
--- a/templates/blog/new_domains.html
+++ b/templates/blog/new_domains.html
@@ -32,21 +32,7 @@ Register even more Australian SLDs on HNSAU.">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/blog/pins.html b/templates/blog/pins.html
index 7a54afa..a204860 100644
--- a/templates/blog/pins.html
+++ b/templates/blog/pins.html
@@ -31,21 +31,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/cart.html b/templates/cart.html
index 41f2764..36f33d8 100644
--- a/templates/cart.html
+++ b/templates/cart.html
@@ -29,21 +29,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/contact.html b/templates/contact.html
index c79d3fe..cb2b62f 100644
--- a/templates/contact.html
+++ b/templates/contact.html
@@ -30,21 +30,7 @@
     <link rel="stylesheet" href="/assets/fonts/fontawesome-all.min.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
@@ -73,17 +59,15 @@
     <section class="d-print-none d-lg-none d-xl-none d-xxl-none clean-block clean-info dark" style="text-align: center;padding-top: 20px;max-width: 100%;">
         <h1>G'day, we are most active in Discord</h1><!-- <iframe src="https://discord.com/widget?id=932192727200829440&theme=dark" width="350" height="500" allowtransparency="true" frameborder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"></iframe> -->
 <widgetbot server="932192727200829440" channel="932216772113858611" width="100%" height="600"></widgetbot>
-<script src="https://cdn.jsdelivr.net/npm/@widgetbot/html-embed"></script>
-        <div style="margin-top: 20px;"><a class="btn btn-primary" role="button" style="font-size: 20px;" href="https://discord.gg/8GmVe9nGCn" target="_blank"><i class="fab fa-discord"></i>Join Server</a></div>
-    </section>
-    <section class="d-none d-lg-block d-xl-block d-xxl-block clean-block clean-info dark" style="text-align: center;padding-top: 20px;max-width: 100%;">
-        <h1>G'day, we are most active in Discord</h1><!-- <iframe src="https://discord.com/widget?id=932192727200829440&theme=dark" width="350" height="500" allowtransparency="true" frameborder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"></iframe> -->
-<widgetbot server="932192727200829440" channel="932216772113858611" width="800" height="600"></widgetbot>
 <script src="https://cdn.jsdelivr.net/npm/@widgetbot/html-embed"></script>
         <div style="margin-top: 20px;"><a class="btn btn-primary" role="button" style="font-size: 20px;" href="https://discord.gg/8GmVe9nGCn" target="_blank"><i class="fab fa-discord"></i>Join Server</a></div>
     </section>
     <section class="text-center">
-        <h1>Or you can contact us via Email<br><a class="btn btn-primary" role="button" href="/email" target="_blank">Send us an Email</a><br></h1>
+        <h1>You can contact us via Email<br><a class="btn btn-primary" role="button" href="/email" target="_blank">Send us an Email</a></h1>
+    </section>
+    <section class="d-none d-lg-block d-xl-block d-xxl-block clean-block clean-info dark" style="text-align: center;padding-top: 20px;max-width: 100%;">
+        <h1>We are also very active on Discord</h1>
+        <div style="margin-top: 20px;"><a class="btn btn-primary" role="button" style="font-size: 20px;" href="https://discord.gg/8GmVe9nGCn" target="_blank"><i class="fab fa-discord"></i>Join Server</a></div>
     </section>
     <footer class="page-footer dark">
         <div class="container">
diff --git a/templates/domains.html b/templates/domains.html
index e802fcc..62c17cb 100644
--- a/templates/domains.html
+++ b/templates/domains.html
@@ -29,21 +29,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/faq.html b/templates/faq.html
index 42399da..02ed80e 100644
--- a/templates/faq.html
+++ b/templates/faq.html
@@ -29,21 +29,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/index.html b/templates/index.html
index c9f66a4..80e4ae1 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -37,21 +37,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body><script src="https://gday.hnsau/handshake.js" domain="gday.hnsau"></script>
diff --git a/templates/links.html b/templates/links.html
index 70f4080..7a8a8d0 100644
--- a/templates/links.html
+++ b/templates/links.html
@@ -29,21 +29,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/login.html b/templates/login.html
index 07de22a..ff271ea 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -29,21 +29,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/payment.html b/templates/payment.html
index 77eec91..84223e5 100644
--- a/templates/payment.html
+++ b/templates/payment.html
@@ -29,21 +29,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/payment_info.html b/templates/payment_info.html
index c8e76d5..a5069b9 100644
--- a/templates/payment_info.html
+++ b/templates/payment_info.html
@@ -29,21 +29,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/pins.html b/templates/pins.html
index e028a53..360e49d 100644
--- a/templates/pins.html
+++ b/templates/pins.html
@@ -29,21 +29,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/pins/pack1.html b/templates/pins/pack1.html
index 26f6c9b..d21db7d 100644
--- a/templates/pins/pack1.html
+++ b/templates/pins/pack1.html
@@ -30,21 +30,7 @@
     <link rel="stylesheet" href="/assets/fonts/simple-line-icons.min.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/pins/pack2.html b/templates/pins/pack2.html
index 78909d9..ad64555 100644
--- a/templates/pins/pack2.html
+++ b/templates/pins/pack2.html
@@ -30,21 +30,7 @@
     <link rel="stylesheet" href="/assets/fonts/simple-line-icons.min.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/promo.html b/templates/promo.html
index 6631db9..db0520c 100644
--- a/templates/promo.html
+++ b/templates/promo.html
@@ -29,21 +29,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
diff --git a/templates/sitemap.xml b/templates/sitemap.xml
index d8505f4..66e9bba 100644
--- a/templates/sitemap.xml
+++ b/templates/sitemap.xml
@@ -15,6 +15,12 @@
     <url>
         <loc>https://hns.au/pins/pack2</loc>
     </url>
+    <url>
+        <loc>https://hns.au/tlds/australia</loc>
+    </url>
+    <url>
+        <loc>https://hns.au/tlds/newzealand</loc>
+    </url>
     <url>
         <loc>https://hns.au/404</loc>
     </url>
diff --git a/templates/tlds/australia.html b/templates/tlds/australia.html
new file mode 100644
index 0000000..1b3b46b
--- /dev/null
+++ b/templates/tlds/australia.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html data-bs-theme="dark" lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
+    <title>Home - HNSAU</title>
+    <meta name="theme-color" content="#ffffff">
+    <link rel="canonical" href="https://hns.au/tlds/australia.html">
+    <meta property="og:url" content="https://hns.au/tlds/australia.html">
+    <meta name="twitter:image" content="https://hns.au/assets/img/HNSAUbanner.png">
+    <meta name="twitter:description" content="The home of Australians using the decentralized web, built on Handshake.">
+    <meta name="twitter:card" content="summary_large_image">
+    <meta property="og:description" content="The home of Australians using the decentralized web, built on Handshake.">
+    <meta name="description" content="Handshake Australia">
+    <meta property="og:title" content="HNS AU">
+    <meta property="og:type" content="website">
+    <meta name="twitter:title" content="HNS AU">
+    <meta property="og:image" content="https://hns.au/assets/img/HNSAUbanner.png">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png" media="(prefers-color-scheme: dark)">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png" media="(prefers-color-scheme: dark)">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png">
+    <link rel="stylesheet" href="/assets/bootstrap/css/bootstrap.min.css">
+    <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
+    <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
+</head>
+
+<body>
+    <nav class="navbar navbar-expand-lg fixed-top bg-dark clean-navbar navbar-light" data-bs-theme="dark">
+        <div class="container-fluid"><a class="navbar-brand logo" href="/" style="width: 50%;"><img src="/assets/img/favicon.png" style="height: 50px;margin-right: 10px;">HNSAU</a><button data-bs-toggle="collapse" class="navbar-toggler" data-bs-target="#navcol-1"><span class="visually-hidden">Toggle navigation</span><span class="navbar-toggler-icon"></span></button>
+            <div class="collapse navbar-collapse" id="navcol-1">
+                <ul class="navbar-nav ms-auto">
+                    <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+                    <li class="nav-item"><a class="nav-link" href="/blog">Blog</a></li>
+                    <li class="nav-item"><a class="nav-link" href="/links">Links</a></li>
+                    <li class="nav-item"><a class="nav-link" href="/about">About Us</a></li>
+                    <li class="nav-item"><a class="nav-link" href="https://domains.hns.au">Domains</a></li>
+                    <li class="nav-item"><a class="nav-link" href="/pins">Pins</a></li>
+                    <li class="nav-item"><a class="nav-link" href="/contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <main class="page landing-page">
+        <section class="clean-block clean-hero" style="color: rgba(0,0,0,0.53);background: url(&quot;/assets/img/scenery/image6.jpg&quot;) center / cover no-repeat;">
+            <div class="text">
+                <h1>.Australia/</h1>
+                <p>Join HNSAU in shaping the future of Australian web development with .Australia, a domain for promoting Handshake Blockchain DNS and Domains, offering a decentralized, secure, and censorship-resistant online presence.</p>
+            </div>
+        </section>
+        <section class="clean-block clean-info dark">
+            <div class="container">
+                <div class="block-heading">
+                    <h2 class="text-info">Info</h2>
+                    <p>The .Australia top-level domain (TLD) is owned by HNSAU, also known as Handshake Australia. HNSAU's mission is to promote the adoption and use of Handshake Blockchain DNS and Domains in Australia.<br><br>HNSAU is dedicated to supporting Australian businesses in transitioning to Handshake domains and empowering them to leverage the benefits of decentralized web technologies.</p>
+                </div>
+                <div class="row align-items-center">
+                    <div class="col-md-6"><img class="img-thumbnail" src="/assets/img/blog/dot_australia.png"></div>
+                    <div class="col-md-6">
+                        <h3>Usage</h3>
+                        <div class="getting-started-info">
+                            <p>.Australia/ will be not be for sale until we can guarantee use in partnership with Australian businesses or individuals. We are offering SLDs for Aussies if they have a specific project or use in mind. These will be given after consideration with the HNSAU team.</p>
+                        </div><a class="btn btn-outline-primary btn-lg" role="button" href="/contact">Inquire Now</a>
+                    </div>
+                </div>
+            </div>
+        </section>
+    </main>
+    <footer class="page-footer dark">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-3">
+                    <h5>Get started</h5>
+                    <ul>
+                        <li><a href="/">Home</a></li>
+                        <li><a href="/links">Links</a></li>
+                        <li><a href="/domains" target="_blank">Domains</a></li>
+                    </ul>
+                </div>
+                <div class="col-sm-3">
+                    <h5>Contact</h5>
+                    <ul>
+                        <li><a href="https://discord.gg/WJ6vpjuQv5" target="_blank">Discord</a></li>
+                        <li><a href="/email" target="_blank">Email</a></li>
+                        <li><a href="/about">About Us</a></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="footer-copyright">
+            <p>© {{year}} Handshake AU</p>
+        </div>
+    </footer>
+    <script src="/assets/bootstrap/js/bootstrap.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.js"></script>
+    <script src="/assets/js/vanilla-zoom.js"></script>
+    <script src="/assets/js/theme.js"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/templates/tlds/newzealand.html b/templates/tlds/newzealand.html
new file mode 100644
index 0000000..391315f
--- /dev/null
+++ b/templates/tlds/newzealand.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html data-bs-theme="dark" lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
+    <title>Home - HNSAU</title>
+    <meta name="theme-color" content="#ffffff">
+    <link rel="canonical" href="https://hns.au/tlds/newzealand.html">
+    <meta property="og:url" content="https://hns.au/tlds/newzealand.html">
+    <meta name="twitter:image" content="https://hns.au/assets/img/HNSAUbanner.png">
+    <meta name="twitter:description" content="The home of Australians using the decentralized web, built on Handshake.">
+    <meta name="twitter:card" content="summary_large_image">
+    <meta property="og:description" content="The home of Australians using the decentralized web, built on Handshake.">
+    <meta name="description" content="Handshake Australia">
+    <meta property="og:title" content="HNS AU">
+    <meta property="og:type" content="website">
+    <meta name="twitter:title" content="HNS AU">
+    <meta property="og:image" content="https://hns.au/assets/img/HNSAUbanner.png">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png" media="(prefers-color-scheme: dark)">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png" media="(prefers-color-scheme: dark)">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png">
+    <link rel="icon" type="image/png" sizes="600x627" href="/assets/img/favicon.png">
+    <link rel="stylesheet" href="/assets/bootstrap/css/bootstrap.min.css">
+    <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
+    <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
+</head>
+
+<body>
+    <nav class="navbar navbar-expand-lg fixed-top bg-dark clean-navbar navbar-light" data-bs-theme="dark">
+        <div class="container-fluid"><a class="navbar-brand logo" href="/" style="width: 50%;"><img src="/assets/img/favicon.png" style="height: 50px;margin-right: 10px;">HNSAU</a><button data-bs-toggle="collapse" class="navbar-toggler" data-bs-target="#navcol-1"><span class="visually-hidden">Toggle navigation</span><span class="navbar-toggler-icon"></span></button>
+            <div class="collapse navbar-collapse" id="navcol-1">
+                <ul class="navbar-nav ms-auto">
+                    <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
+                    <li class="nav-item"><a class="nav-link" href="/blog">Blog</a></li>
+                    <li class="nav-item"><a class="nav-link" href="/links">Links</a></li>
+                    <li class="nav-item"><a class="nav-link" href="/about">About Us</a></li>
+                    <li class="nav-item"><a class="nav-link" href="https://domains.hns.au">Domains</a></li>
+                    <li class="nav-item"><a class="nav-link" href="/pins">Pins</a></li>
+                    <li class="nav-item"><a class="nav-link" href="/contact">Contact</a></li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+    <main class="page landing-page">
+        <section class="clean-block clean-hero" style="color: rgba(0,0,0,0.53);background: url(&quot;/assets/img/scenery/image6.jpg&quot;) center / cover no-repeat;">
+            <div class="text">
+                <h1>.NewZealand/</h1>
+                <p>Join HNSAU in shaping the future of New Zealand web development with .NewZealand, a domain for promoting Handshake Blockchain DNS and Domains, offering a decentralized, secure, and censorship-resistant online presence.</p>
+            </div>
+        </section>
+        <section class="clean-block clean-info dark">
+            <div class="container">
+                <div class="block-heading">
+                    <h2 class="text-info">Info</h2>
+                    <p>The .NewZealand top-level domain (TLD) is owned by HNSAU, also known as Handshake Australia. HNSAU's mission is to promote the adoption and use of Handshake Blockchain DNS and Domains in Australia &amp; New Zealand.<br><br>HNSAU is dedicated to supporting Australian &amp; New Zealand businesses in transitioning to Handshake domains and empowering them to leverage the benefits of decentralized web technologies.</p>
+                </div>
+                <div class="row align-items-center">
+                    <div class="col-md-6"><img class="img-thumbnail" src="/assets/img/blog/dot_newzealand.webp"></div>
+                    <div class="col-md-6">
+                        <h3>Usage</h3>
+                        <div class="getting-started-info">
+                            <p>.NewZealand/ will be not be for sale until we can guarantee use in partnership with Kiwi businesses or individuals. We are offering SLDs for Kiwis if they have a specific project or use in mind. These will be given after consideration with the HNSAU team.</p>
+                        </div><a class="btn btn-outline-primary btn-lg" role="button" href="/contact">Inquire Now</a>
+                    </div>
+                </div>
+            </div>
+        </section>
+    </main>
+    <footer class="page-footer dark">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-3">
+                    <h5>Get started</h5>
+                    <ul>
+                        <li><a href="/">Home</a></li>
+                        <li><a href="/links">Links</a></li>
+                        <li><a href="/domains" target="_blank">Domains</a></li>
+                    </ul>
+                </div>
+                <div class="col-sm-3">
+                    <h5>Contact</h5>
+                    <ul>
+                        <li><a href="https://discord.gg/WJ6vpjuQv5" target="_blank">Discord</a></li>
+                        <li><a href="/email" target="_blank">Email</a></li>
+                        <li><a href="/about">About Us</a></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="footer-copyright">
+            <p>© {{year}} Handshake AU</p>
+        </div>
+    </footer>
+    <script src="/assets/bootstrap/js/bootstrap.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.js"></script>
+    <script src="/assets/js/vanilla-zoom.js"></script>
+    <script src="/assets/js/theme.js"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/templates/uv.html b/templates/uv.html
index 60aed77..ba80464 100644
--- a/templates/uv.html
+++ b/templates/uv.html
@@ -29,21 +29,7 @@
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,700,700i,600,600i&amp;display=swap">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/baguettebox.js/1.10.0/baguetteBox.min.css">
     <link rel="stylesheet" href="/assets/css/vanilla-zoom.min.css">
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://analytics.woodburn.au/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '8']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->
+<script async src="https://umami.woodburn.au/script.js" data-website-id="15852010-8d3c-4553-92fc-2d6ac31098e8"></script>
 </head>
 
 <body>
