diff --git a/index.html b/index.html
index 7caa4fc..cbf78d3 100644
--- a/index.html
+++ b/index.html
@@ -28,20 +28,21 @@
     <link rel="openid.delegate" href="https://luke.tainton.uk/" />
 
     <!-- Matomo -->
-    <script type="text/javascript">
-	    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://matomo.tainton.uk/";
-		    _paq.push(['setTrackerUrl', u+'matomo.php']);
-		    _paq.push(['setSiteId', '2']);
-		    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-		    g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-	    })();
-    </script>
-    <!-- End Matomo Code -->
+	<script type="text/javascript">
+		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://matomo.tainton.uk/";
+		_paq.push(['setTrackerUrl', u+'matomo.php']);
+		_paq.push(['setSiteId', '2']);
+		var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+		g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+		})();
+	</script>
+	<noscript><p><img src="https://matomo.tainton.uk/matomo.php?idsite=2&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+	<!-- End Matomo Code -->
 
   </head>
 
@@ -56,11 +57,11 @@
 
 	      <div class="collapse navbar-collapse" id="ftco-nav">
           <ul class="navbar-nav nav ml-auto">
-	         <li class="nav-item"><a href="#home-section" class="nav-link umami--click--navbar-home"><span>Home</span></a></li>
-	         <li class="nav-item"><a href="#about-section" class="nav-link umami--click--navbar-about"><span>About</span></a></li>
-	         <li class="nav-item"><a href="#resume-section" class="nav-link umami--click--navbar-resume"><span>Resume</span></a></li>
-			     <li class="nav-item"><a href="https://github.com/luketainton" target="_blank" class="nav-link umami--click--navbar-projects"><span>Projects</span></a></li>
-	         <li class="nav-item"><a href="#contact-section" class="nav-link umami--click--navbar-contact"><span>Contact</span></a></li>
+	         <li class="nav-item"><a href="#home-section" class="nav-link"><span>Home</span></a></li>
+	         <li class="nav-item"><a href="#about-section" class="nav-link"><span>About</span></a></li>
+	         <li class="nav-item"><a href="#resume-section" class="nav-link"><span>Resume</span></a></li>
+			     <li class="nav-item"><a href="https://github.com/luketainton" target="_blank" class="nav-link"><span>Projects</span></a></li>
+	         <li class="nav-item"><a href="#contact-section" class="nav-link"><span>Contact</span></a></li>
 	        </ul>
 	      </div>
 	    </div>
@@ -105,16 +106,16 @@
 		            <p>Here's where you can find me.</p>
 		            <ul class="about-info mt-4 px-md-0 px-2">
 		            	<li class="d-flex"><span>Address:</span> <span>Unit 32399, PO Box 92, Cardiff, CF11 1NB, UK</span></li>
-						<li class="d-flex"><span>Email:</span> <span><a class="umami--click--about-email" rel="me" href="mailto:luke@tainton.uk">luke@tainton.uk</a></span></li>
-						<li class="d-flex"><span>GitHub:</span> <span><a class="umami--click--about-github" rel="me" href="https://github.com/luketainton" target="_blank">luketainton</a></span></li>
-						<li class="d-flex"><span>LinkedIn:</span> <span><a class="umami--click--about-linkedin" rel="me" href="https://linkedin.com/in/luketainton" target="_blank">luketainton</a></span></li>
-						<li class="d-flex"><span>Twitter:</span> <span><a class="umami--click--about-twitter" rel="me" href="https://twitter.com/luketainton1" target="_blank">@luketainton1</a></span></li>
+						<li class="d-flex"><span>Email:</span> <span><a rel="me" href="mailto:luke@tainton.uk">luke@tainton.uk</a></span></li>
+						<li class="d-flex"><span>GitHub:</span> <span><a rel="me" href="https://github.com/luketainton" target="_blank">luketainton</a></span></li>
+						<li class="d-flex"><span>LinkedIn:</span> <span><a rel="me" href="https://linkedin.com/in/luketainton" target="_blank">luketainton</a></span></li>
+						<li class="d-flex"><span>Twitter:</span> <span><a rel="me" href="https://twitter.com/luketainton1" target="_blank">@luketainton1</a></span></li>
 		            </ul>
 		          </div>
 		        </div>
 	          <div class="counter-wrap ftco-animate d-flex mt-md-3">
 				<div class="text">
-					<p><a href="mailto:luke@tainton.uk?subject=I'd%20like%20a%20copy%20of%20your%20CV" class="btn btn-primary py-3 px-3 umami--click--about-cv">Request CV</a></p>
+					<p><a href="mailto:luke@tainton.uk?subject=I'd%20like%20a%20copy%20of%20your%20CV" class="btn btn-primary py-3 px-3">Request CV</a></p>
 				</div>
 	          </div>
 	        </div>
@@ -220,7 +221,7 @@
 		    					<span class="date">1 May 2018 - 8 Aug 2022</span>
 		    					<h2>Cisco Certified Network Associate</h2>
 		    					<span class="position">Cisco Systems</span>
-		    					<p><a class="umami--click--resume-ccna-cert" href="/files/CCNA.pdf">Certificate</a> | <a class="umami--click--resume-ccna-acclaim" href="https://www.youracclaim.com/badges/59299a80-e3ab-4c59-b5c8-aa39962bf13d/public_url">Acclaim Badge</a></p>
+		    					<p><a href="/files/CCNA.pdf">Certificate</a> | <a href="https://www.youracclaim.com/badges/59299a80-e3ab-4c59-b5c8-aa39962bf13d/public_url">Acclaim Badge</a></p>
 	    					</div>
 						</div>
 						<div class="resume-wrap d-flex ftco-animate">
@@ -231,7 +232,7 @@
 		    					<span class="date">June 2020</span>
 		    					<h2>Microsoft Azure Fundamentals</h2>
 		    					<span class="position">Microsoft Corporation</span>
-		    					<p><a class="umami--click--resume-azure-cert" href="/files/azure-fundamentals.pdf">Certificate</a> | <a class="umami--click--resume-azure-acclaim" href="https://www.youracclaim.com/badges/bc21d220-1268-4a80-98bb-cbabc4c0dd6f/public_url">Acclaim Badge</a></p>
+		    					<p><a href="/files/azure-fundamentals.pdf">Certificate</a> | <a href="https://www.youracclaim.com/badges/bc21d220-1268-4a80-98bb-cbabc4c0dd6f/public_url">Acclaim Badge</a></p>
 	    					</div>
 						</div>
 					  </div>
@@ -247,7 +248,7 @@
             <h1 class="big big-2">Contact</h1>
             <h2 class="mb-4">Contact Me</h2>
 			<p>Want to have a chat? Just drop me a line!</p>
-			<p>My PGP key is available <a class="umami--click--contact-pgpkey" rel="pgpkey" href="/files/public.asc">here</a> if you want to secure your communications with me.</p>
+			<p>My PGP key is available <a rel="pgpkey" href="/files/public.asc">here</a> if you want to secure your communications with me.</p>
           </div>
         </div>
 
@@ -259,7 +260,7 @@
           		</div>
           		<div>
 	          		<h3 class="mb-4">Email</h3>
-		            <p><a class="umami--click--contact-email" rel="me" href="mailto:luke@tainton.uk">luke@tainton.uk</a></p>
+		            <p><a rel="me" href="mailto:luke@tainton.uk">luke@tainton.uk</a></p>
 	            </div>
 	          </div>
           </div>
@@ -270,7 +271,7 @@
           		</div>
           		<div>
 	          		<h3 class="mb-4">Twitter</h3>
-		            <p><a class="umami--click--contact-twitter" rel="me" href="https://twitter.com/luketainton1">@luketainton1</a></p>
+		            <p><a rel="me" href="https://twitter.com/luketainton1">@luketainton1</a></p>
 	            </div>
 	          </div>
 		  </div>
@@ -284,12 +285,12 @@
         <div class="row">
           <div class="col-md-12 text-center">
 			  <!-- Link back to Colorlib can't be removed. Template is licensed under CC BY 3.0. -->
-            <p>Copyright <script>document.write(new Date().getFullYear());</script>, all rights reserved. This template is made with <i class="icon-heart color-danger umami--click--footer-colorlib" aria-hidden="true"></i> by <a href="https://colorlib.com" target="_blank">Colorlib</a>.</p>
+            <p>Copyright <script>document.write(new Date().getFullYear());</script>, all rights reserved. This template is made with <i class="icon-heart color-danger" aria-hidden="true"></i> by <a href="https://colorlib.com" target="_blank">Colorlib</a>.</p>
           </div>
 		</div>
 		<div class="row">
 			<div class="col-md-12 text-center">
-			  <p>Proudly hosted by <a class="umami--click--contact-ghpages" href="https://github.com/luketainton/luketainton.github.io">GitHub Pages</a>.</p>
+			  <p>Proudly hosted by <a href="https://github.com/luketainton/luketainton.github.io">GitHub Pages</a>.</p>
 			</div>
 		  </div>
       </div>