diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 995fffa73..ec7e3dc20 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -17,6 +17,7 @@
+ {{ partial "twitter-card" . }}
{{ if isset .Site.Params "css_modules" }}
{{ range .Site.Params.css_modules }}
diff --git a/layouts/partials/twitter-card.html b/layouts/partials/twitter-card.html
new file mode 100644
index 000000000..2b01b3e5a
--- /dev/null
+++ b/layouts/partials/twitter-card.html
@@ -0,0 +1,31 @@
+{{ with .Params.twitter }}
+
+
+ {{ if ne .card "app" -}}
+
+
+ {{ with .image_alt -}}{{- end }}
+ {{- end }}
+ {{ with .creator -}}{{- end }}
+
+ {{- if eq .card "app" }}
+ {{ with .app_country }}{{ end }}
+ {{ with .app_name_iphone }}{{ end }}
+ {{ with .app_id_iphone }}{{ end }}
+ {{ with .app_url_iphone }}{{ end }}
+ {{ with .app_name_ipad }}{{ end }}
+ {{ with .app_id_ipad }}{{ end }}
+ {{ with .app_url_ipad }}{{ end }}
+ {{ with .app_name_googleplay }}{{ end }}
+ {{ with .app_id_googleplay }}{{ end }}
+ {{ with .app_url_googleplay }}{{ end }}
+ {{- end }}
+
+ {{- if eq .card "player" }}
+ {{ with .player }}{{ end }}
+ {{ with .player_width }}{{ end }}
+ {{ with .player_height }}{{ end }}
+ {{ with .player_stream }}{{ end }}
+ {{ with .player_stream_content_type }}{{ end }}
+ {{- end }}
+{{ end }}
\ No newline at end of file