diff --git a/archetypes/blog/index.md b/archetypes/blog/index.md
index 5c06aa9..feb552f 100644
--- a/archetypes/blog/index.md
+++ b/archetypes/blog/index.md
@@ -12,16 +12,10 @@ tags = [
   "awesome",
 ]
 
-# this image will be shown for the article in list pages
+# this will be shown for the article in list pages
+# currently it can be either an image or video
 [[resources]]
 name = "feature"
 src = "something.webp"
 title = "Some image (image format can be anything; webp is just an example)"
-
-# same as above, but a video. only one will be shown; image takes
-# priority over video
-[[resources]]
-name = "feature-video"
-src = "whatever.webm"
-title = "Whatever video (video format can be anything; webm is just an example)"
 +++
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index dfe2ccd..0346a5f 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -69,11 +69,11 @@
     {{ end }}
 
     {{ with .Resources.GetMatch "feature" }}
+    {{ if eq .MediaType.MainType "image" }}
     <div class="post-media">
         <img src="{{ .Permalink }}" alt="{{ .Title }}" />
     </div>
-    {{ else }}
-    {{ with .Resources.GetMatch "feature-video" }}
+    {{ else if eq .MediaType.MainType "video" }}
     <div class="post-media">
         <video controls>
             <source src="{{ .Permalink }}" alt="{{ .Title }}">
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 12e63c4..d1ac18f 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -22,7 +22,7 @@
     <title>{{ print .Title " | " .Site.Title }}</title>
     {{ end }}
 
-    {{ template "_internal/opengraph.html" . }}
+    {{ partial "opengraph.html" . }}
     {{ template "_internal/twitter_cards.html" . }}
     {{ template "_internal/schema.html" . }}
 
diff --git a/layouts/partials/opengraph.html b/layouts/partials/opengraph.html
new file mode 100644
index 0000000..4a947d2
--- /dev/null
+++ b/layouts/partials/opengraph.html
@@ -0,0 +1,52 @@
+<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" -}}
+<meta property="article:section" content="{{ .Section }}" />
+{{ 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.Params.title }}<meta property="og:site_name" content="{{ . }}" />{{ end }}
+
+{{- $videos := $.Resources.ByType "video" -}}
+{{- $featured_video := $videos.GetMatch "*feature*" -}}
+{{- if not $featured_video }}{{ $featured_video = $videos.GetMatch "{*cover*,*thumbnail*}" }}{{ end -}}
+{{- with $featured_video -}}
+<meta property="og:video" content="{{ $featured_video.Permalink | absURL }}" />
+{{- else -}}
+{{- with .Params.videos }}{{- range . }}
+<meta property="og:video" content="{{ . | absURL }}" />
+{{ end }}{{ end }}
+{{- end -}}
+
+{{- /* If it is part of a series, link to related articles */}}
+{{- $permalink := .Permalink }}
+{{- $siteSeries := .Site.Taxonomies.series }}
+{{ 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 }}
+
+{{- /* Facebook Page Admin ID for Domain Insights */}}
+{{- with .Site.Social.facebook_admin }}<meta property="fb:admins" content="{{ . }}" />{{ end }}