diff --git a/resources/views/layout/analytics.blade.php b/resources/views/layout/analytics.blade.php
index b61692474..6647a9049 100644
--- a/resources/views/layout/analytics.blade.php
+++ b/resources/views/layout/analytics.blade.php
@@ -1,7 +1,7 @@
-
+<!-- Analytics - only runs if user accepts statistics cookies -->
 
 <!-- Matomo -->
-<script type="text/javascript">
+<script type="text/plain" data-cookieconsent="statistics">
     var _paq = window._paq || [];
     /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
     _paq.push(['trackPageView']);
diff --git a/resources/views/layout/base.blade.php b/resources/views/layout/base.blade.php
index 74b76329d..3b29cf99a 100755
--- a/resources/views/layout/base.blade.php
+++ b/resources/views/layout/base.blade.php
@@ -1,13 +1,7 @@
 <!DOCTYPE html>
 <html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
 <head>
-@if(!isset(Request::header()["dnt"]))
-    @if (Cookie::get('codeweek_cookie_consent') == 1)
-        @include('layout.analytics')
-    @endif
-@else
-    <!-- DO NOT TRACK removed Analytics -->
-    @endif
+    @include('layout.analytics')
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
@@ -113,21 +107,17 @@
 </div>
 
 <!-- Scripts -->
-@if(!isset(Request::header()["dnt"]))
-    @if (Cookie::get('codeweek_cookie_consent') == 1)
-        <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
-        <script>(function (d, s, id) {
-                var js, fjs = d.getElementsByTagName(s)[0];
-                if (d.getElementById(id)) return;
-                js = d.createElement(s);
-                js.id = id;
-                js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
-                fjs.parentNode.insertBefore(js, fjs);
-            }(document, 'script', 'facebook-jssdk'));</script>
-
-    @endif
-@endif
-
+<script data-cookieconsent="marketing" async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+<script type="text/plain" data-cookieconsent="marketing">
+    (function (d, s, id) {
+        var js, fjs = d.getElementsByTagName(s)[0];
+        if (d.getElementById(id)) return;
+        js = d.createElement(s);
+        js.id = id;
+        js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
+        fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));
+</script>
 
 @vite('resources/js/app.js')
 <script type="text/javascript" src="{{ asset('lib/jquery/jquery.js') }}"></script>
diff --git a/resources/views/layout/guest.blade.php b/resources/views/layout/guest.blade.php
index 3f314d9b8..32cccf7ee 100644
--- a/resources/views/layout/guest.blade.php
+++ b/resources/views/layout/guest.blade.php
@@ -1,13 +1,7 @@
 <!DOCTYPE html>
 <html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
 <head>
-    @if(!isset(Request::header()["dnt"]))
-        @if (Cookie::get('codeweek_cookie_consent') == 1)
-            @include('layout.analytics')
-        @endif
-    @else
-        <!-- DO NOT TRACK removed Analytics -->
-    @endif
+    @include('layout.analytics')
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
@@ -81,20 +75,17 @@
 </div>
 
 <!-- Scripts -->
-@if(!isset(Request::header()["dnt"]))
-    @if (Cookie::get('codeweek_cookie_consent') == 1)
-        <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
-        <script>(function (d, s, id) {
-                var js, fjs = d.getElementsByTagName(s)[0];
-                if (d.getElementById(id)) return;
-                js = d.createElement(s);
-                js.id = id;
-                js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
-                fjs.parentNode.insertBefore(js, fjs);
-            }(document, 'script', 'facebook-jssdk'));</script>
-
-    @endif
-@endif
+<script data-cookieconsent="marketing" async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+<script type="text/plain" data-cookieconsent="marketing">
+    (function (d, s, id) {
+        var js, fjs = d.getElementsByTagName(s)[0];
+        if (d.getElementById(id)) return;
+        js = d.createElement(s);
+        js.id = id;
+        js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
+        fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));
+</script>
 
 
 @vite('resources/js/app.js')
diff --git a/resources/views/layout/new_base.blade.php b/resources/views/layout/new_base.blade.php
index 3e65e7463..c35e8a952 100644
--- a/resources/views/layout/new_base.blade.php
+++ b/resources/views/layout/new_base.blade.php
@@ -1,13 +1,7 @@
 <!DOCTYPE html>
 <html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
 <head>
-    @if(!isset(Request::header()["dnt"]))
-      @if (Cookie::get('codeweek_cookie_consent') == 1)
-        @include('layout.analytics')
-      @endif
-    @else
-      <!-- DO NOT TRACK removed Analytics -->
-    @endif
+    @include('layout.analytics')
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
@@ -102,22 +96,17 @@
     </div>
 
     <!-- Scripts -->
-    @if(!isset(Request::header()["dnt"]))
-      @if (Cookie::get('codeweek_cookie_consent') == 1)
-        <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
-        <script>
-            (function(d, s, id) {
-                var js, fjs = d.getElementsByTagName(s)[0];
-                if (d.getElementById(id)) return;
-                js = d.createElement(s);
-                js.id = id;
-                js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
-                fjs.parentNode.insertBefore(js, fjs);
-            }(document, 'script', 'facebook-jssdk'));
-
-        </script>
-      @endif
-    @endif
+    <script data-cookieconsent="marketing" async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+    <script type="text/plain" data-cookieconsent="marketing">
+      (function (d, s, id) {
+        var js, fjs = d.getElementsByTagName(s)[0];
+        if (d.getElementById(id)) return;
+        js = d.createElement(s);
+        js.id = id;
+        js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
+        fjs.parentNode.insertBefore(js, fjs);
+      }(document, 'script', 'facebook-jssdk'));
+    </script>
 
     {{-- Animation script --}}
     <script type="text/javascript">
diff --git a/resources/views/layout/simple.blade.php b/resources/views/layout/simple.blade.php
index 1b2315a31..636068e9f 100755
--- a/resources/views/layout/simple.blade.php
+++ b/resources/views/layout/simple.blade.php
@@ -1,13 +1,7 @@
 <!DOCTYPE html>
 <html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
 <head>
-    @if(!isset(Request::header()["dnt"]))
-        @if (Cookie::get('codeweek_cookie_consent') == 1)
-            @include('layout.analytics')
-        @endif
-    @else
-        <!-- DO NOT TRACK removed Analytics -->
-    @endif
+    @include('layout.analytics')
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
diff --git a/resources/views/layout/tall.blade.php b/resources/views/layout/tall.blade.php
index 3731259c5..026655f4d 100644
--- a/resources/views/layout/tall.blade.php
+++ b/resources/views/layout/tall.blade.php
@@ -1,13 +1,7 @@
 <!DOCTYPE html>
 <html dir="ltr" lang="{{App::getLocale()}}" class="no-js">
 <head>
-@if(!isset(Request::header()["dnt"]))
-    @if (Cookie::get('codeweek_cookie_consent') == 1)
-        @include('layout.analytics')
-    @endif
-@else
-    <!-- DO NOT TRACK removed Analytics -->
-    @endif
+    @include('layout.analytics')
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
@@ -91,20 +85,17 @@
 </div>
 
 <!-- Scripts -->
-@if(!isset(Request::header()["dnt"]))
-    @if (Cookie::get('codeweek_cookie_consent') == 1)
-        <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
-        <script>(function (d, s, id) {
-                var js, fjs = d.getElementsByTagName(s)[0];
-                if (d.getElementById(id)) return;
-                js = d.createElement(s);
-                js.id = id;
-                js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
-                fjs.parentNode.insertBefore(js, fjs);
-            }(document, 'script', 'facebook-jssdk'));</script>
-
-    @endif
-@endif
+<script data-cookieconsent="marketing" async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+<script type="text/plain" data-cookieconsent="marketing">
+    (function (d, s, id) {
+        var js, fjs = d.getElementsByTagName(s)[0];
+        if (d.getElementById(id)) return;
+        js = d.createElement(s);
+        js.id = id;
+        js.src = 'https://connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v3.2';
+        fjs.parentNode.insertBefore(js, fjs);
+    }(document, 'script', 'facebook-jssdk'));
+</script>
 
 {{--@vite('resources/js/app.js')--}}
 <script type="text/javascript" src="{{ asset('lib/jquery/jquery.js') }}"></script>
