diff --git a/exampleSite/config/_default/config.toml b/exampleSite/config/_default/config.toml
index 0890b88285..fb68cc15bc 100644
--- a/exampleSite/config/_default/config.toml
+++ b/exampleSite/config/_default/config.toml
@@ -34,7 +34,7 @@ defaultContentLanguage = "en"
 # disableLanguages = ['pir']
 
 # the site's title of this showcase; you should change this ;-)
-title = "Hugo Relearn Documentation"
+title = "Hugo Relearn Theme"
 
 [outputs]
   # add JSON to the home to support Lunr search; This is a mandatory setting
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index de45332fda..9df35b64cf 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -17,4 +17,5 @@
     {{- with .Site.Params.author }}
     <meta name="author" content="{{ . }}">
     {{- end }}
-{{ partial "indent.html" (dict "content" (partial "social.html" .) "indention" "    ") }}
\ No newline at end of file
+    {{- partial "opengraph.html" . }}
+    {{- partial "twitter_cards.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/opengraph.html b/layouts/partials/opengraph.html
new file mode 100644
index 0000000000..f49806d149
--- /dev/null
+++ b/layouts/partials/opengraph.html
@@ -0,0 +1,109 @@
+{{- /* based on Hugo 0.119.0 _internal/opengraph.html but with modified title */}}
+{{- $format := partial "get-format.hugo" . }}
+{{- $outputFormat := partial "output-format.hugo" (dict "page" . "format" $format) }}
+{{- $page := . }}
+{{- $title := .Title }}
+{{- if eq $outputFormat "searchpage" }}
+    {{- $title = T "Search" }}
+{{- else if eq .Kind "taxonomy" }}
+    {{- $title = i18n .Data.Plural }}
+    {{- if not $title }}
+        {{- $title = .Data.Plural }}
+    {{- end }}
+{{- else if eq .Kind "term" }}
+    {{- $title = i18n .Data.Singular }}
+    {{- if not $title }}
+        {{- $title = .Data.Singular }}
+    {{- end }}
+    {{- $title = printf "%s %s %s" .Title (default "::" .Site.Params.titleSeparator) $title }}
+{{- end }}
+{{- if and $title .Site.Title (not (eq $title .Site.Title)) }}
+  {{- $title = printf "%s %s %s" $title (default "::" .Site.Params.titleSeparator) .Site.Title }}
+{{- end }}
+    <meta property="og:title" content="{{ $title }}">
+    <meta property="og:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}">
+    <meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}">
+    <meta property="og:url" content="{{ .Permalink }}">
+{{- with $.Params.images }}
+    {{- range first 6 . }}
+    <meta property="og:image" content="{{ . | absURL }}">
+    {{- end }}
+{{- else }}
+    {{- $images := $.Resources.ByType "image" }}
+    {{- $featured := $images.GetMatch "*feature*" }}
+    {{- if not $featured }}
+        {{- $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}
+    {{- end }}
+    {{- with $featured }}
+    <meta property="og:image" content="{{ $featured.Permalink }}">
+    {{- else }}
+        {{- with $.Site.Params.images }}
+    <meta property="og:image" content="{{ index . 0 | absURL }}">
+        {{- end }}
+    {{- end }}
+{{- end }}
+{{- if .IsPage }}
+    {{- $iso8601 := "2006-01-02T15:04:05-07:00" }}
+    {{- with .Parent }}
+    {{- $page := . }}
+    {{- $link := "<link href=\"%s\" rel=\"%s\" type=\"%s\" title=\"%s\">" }}
+    {{- $title := .Title }}
+    {{- if eq $outputFormat "searchpage" }}
+        {{- $title = T "Search" }}
+    {{- else if eq .Kind "taxonomy" }}
+        {{- $title = i18n .Data.Plural }}
+        {{- if not $title }}
+            {{- $title = .Data.Plural }}
+        {{- end }}
+    {{- else if eq .Kind "term" }}
+        {{- $title = i18n .Data.Singular }}
+        {{- if not $title }}
+            {{- $title = .Data.Singular }}
+        {{- end }}
+        {{- $title = printf "%s %s %s" .Title (default "::" .Site.Params.titleSeparator) $title }}
+    {{- end }}
+    {{- if and $title .Site.Title (not (eq $title .Site.Title)) }}
+      {{- $title = printf "%s %s %s" $title (default "::" .Site.Params.titleSeparator) .Site.Title }}
+    {{- end }}
+    <meta property="article:section" content="{{ $title }}">
+    {{- end }}
+    {{- with .PublishDate }}
+    <meta property="article:published_time" {{ .Format $iso8601 | printf "content=%q" | safeHTMLAttr }}>
+    {{- end }}
+    {{- with .Lastmod }}
+    <meta property="article:modified_time" {{ .Format $iso8601 | printf "content=%q" | safeHTMLAttr }}>
+    {{- end }}
+{{- end }}
+{{- with .Params.audio }}
+    <meta property="og:audio" content="{{ . }}">
+{{- end }}
+{{- with .Params.locale }}
+    <meta property="og:locale" content="{{ . }}">
+{{- end }}
+{{- with .Site.Title }}
+    <meta property="og:site_name" content="{{ . }}">
+{{- end }}
+{{- with .Params.videos }}
+    {{- range . }}
+    <meta property="og:video" content="{{ . | absURL }}">
+    {{- end }}
+{{- end }}
+{{- /* If it is part of a series, link to related articles */}}
+{{- $permalink := .Permalink }}
+{{- $siteSeries := .Site.Taxonomies.series }}
+{{- if $siteSeries }}
+    {{- with .Params.series }}
+        {{- range $name := . }}
+            {{- $series := index $siteSeries ($name | urlize) }}
+            {{- range $page := first 6 $series.Pages }}
+                {{- if ne $page.Permalink $permalink }}
+    <meta property="og:see_also" content="{{ $page.Permalink }}">
+                {{ end }}
+            {{- end }}
+        {{- end }}
+    {{- end }}
+{{- end }}
+{{- /* Facebook Page Admin ID for Domain Insights */}}
+{{- with .Site.Social.facebook_admin }}
+    <meta property="fb:admins" content="{{ . }}">
+{{- end }}
\ No newline at end of file
diff --git a/layouts/partials/social.html b/layouts/partials/social.html
deleted file mode 100644
index d8204e65aa..0000000000
--- a/layouts/partials/social.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{{- template "_internal/opengraph.html" . }}
-{{- template "_internal/twitter_cards.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/twitter_cards.html b/layouts/partials/twitter_cards.html
new file mode 100644
index 0000000000..2d3266ce33
--- /dev/null
+++ b/layouts/partials/twitter_cards.html
@@ -0,0 +1,48 @@
+{{- /* based on Hugo 0.119.0 _internal/twitter_cardss.html but with modified title */}}
+{{- $format := partial "get-format.hugo" . }}
+{{- $outputFormat := partial "output-format.hugo" (dict "page" . "format" $format) }}
+{{- $page := . }}
+{{- $title := .Title }}
+{{- if eq $outputFormat "searchpage" }}
+    {{- $title = T "Search" }}
+{{- else if eq .Kind "taxonomy" }}
+    {{- $title = i18n .Data.Plural }}
+    {{- if not $title }}
+        {{- $title = .Data.Plural }}
+    {{- end }}
+{{- else if eq .Kind "term" }}
+    {{- $title = i18n .Data.Singular }}
+    {{- if not $title }}
+        {{- $title = .Data.Singular }}
+    {{- end }}
+    {{- $title = printf "%s %s %s" .Title (default "::" .Site.Params.titleSeparator) $title }}
+{{- end }}
+{{- if and $title .Site.Title (not (eq $title .Site.Title)) }}
+  {{- $title = printf "%s %s %s" $title (default "::" .Site.Params.titleSeparator) .Site.Title }}
+{{- end }}
+{{- with $.Params.images }}
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:image" content="{{ index . 0 | absURL }}">
+{{- else }}
+    {{- $images := $.Resources.ByType "image" }}
+    {{- $featured := $images.GetMatch "*feature*" }}
+    {{- if not $featured }}
+        {{- $featured = $images.GetMatch "{*cover*,*thumbnail*}" }}
+    {{- end }}
+    {{- with $featured }}
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:image" content="{{ $featured.Permalink }}">
+    {{- else }}
+        {{- with $.Site.Params.images }}
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:image" content="{{ index . 0 | absURL }}">
+        {{- else }}
+    <meta name="twitter:card" content="summary">
+        {{- end }}
+    {{- end }}
+{{- end }}
+    <meta name="twitter:title" content="{{ $title }}">
+    <meta name="twitter:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}">
+{{- with .Site.Social.twitter }}
+    <meta name="twitter:site" content="@{{ . }}">
+{{- end }}
\ No newline at end of file