diff --git a/exampleSite/content/en/posts/rich-content.md b/exampleSite/content/en/posts/rich-content.md
index 86d6127..22656cd 100644
--- a/exampleSite/content/en/posts/rich-content.md
+++ b/exampleSite/content/en/posts/rich-content.md
@@ -32,7 +32,7 @@ Hugo ships with several [Built-in Shortcodes](https://gohugo.io/content-manageme
 
 ## Twitter Simple Shortcode
 
-{{< twitter_simple 1085870671291310081 >}}
+{{< x user="" id="1085870671291310081" >}}
 
 <br>
 
diff --git a/layouts/partials/service/google-analytics.html b/layouts/partials/service/google-analytics.html
index 3527c0e..181cc1e 100644
--- a/layouts/partials/service/google-analytics.html
+++ b/layouts/partials/service/google-analytics.html
@@ -1,4 +1,22 @@
-{{ if not .Site.IsServer }}
-  {{ template "_internal/google_analytics.html" . }}
-  {{ template "_internal/google_analytics_async.html" . }}
-{{ end }}
\ No newline at end of file
+{{ if not site.Config.Privacy.GoogleAnalytics.Disable }}
+  {{- with site.Config.Services.GoogleAnalytics.ID }}
+    {{- if strings.HasPrefix (lower .) "ua-" }}
+      {{- warnf "Google Analytics 4 (GA4) replaced Google Universal Analytics (UA) effective 1 July 2023. See https://support.google.com/analytics/answer/11583528. Create a GA4 property and data stream, then replace the Google Analytics ID in your site configuration with the new value." }}
+    {{- else }}
+      <script async src="https://www.googletagmanager.com/gtag/js?id={{ . }}"></script>
+      <script>
+        var doNotTrack = false;
+        if ({{ site.Config.Privacy.GoogleAnalytics.RespectDoNotTrack }}) {
+          var dnt = (navigator.doNotTrack || window.doNotTrack || navigator.msDoNotTrack);
+          var doNotTrack = (dnt == "1" || dnt == "yes");
+        }
+        if (!doNotTrack) {
+          window.dataLayer = window.dataLayer || [];
+          function gtag(){dataLayer.push(arguments);}
+          gtag('js', new Date());
+          gtag('config', '{{ . }}');
+        }
+      </script>
+    {{- end }}
+  {{- end }}
+{{- end -}}
\ No newline at end of file