diff --git a/config.toml b/config.toml
index 54eaf385..35559289 100644
--- a/config.toml
+++ b/config.toml
@@ -98,9 +98,13 @@ disableAliases = true
   [outputFormats.RSS]
     mediaType = "application/rss"
     baseName = "feed"   # /feed.xml
+    isPlainText = false
+    isHTML = false
   [outputFormats.ATOM]
     mediaType = "application/atom+xml"
     baseName = "feed"   # /feed.atom
+    isPlainText = false
+    isHTML = false
   [outputFormats.AMP]
     mediaType = "text/html"
     baseName = "amp"   # amp.html
diff --git a/layouts/rss.xml b/layouts/rss.xml
index 44216c43..786c038b 100644
--- a/layouts/rss.xml
+++ b/layouts/rss.xml
@@ -22,7 +22,7 @@
       <title>{{ .Title }}</title>
       <link>{{ .Permalink }}</link>
       <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
-      {{ with .Site.Author.name }}<author>{{ . }}</author>{{ end }}
+      {{ with .Site.Author.email }}<author>{{ . }}</author>{{ end }}
       <guid>{{ .Permalink }}</guid>
       <description>
 {{ .Content | html }}
diff --git a/layouts/shortcodes/codepen.atom.atom b/layouts/shortcodes/codepen.atom.atom
new file mode 100644
index 00000000..ab05637e
--- /dev/null
+++ b/layouts/shortcodes/codepen.atom.atom
@@ -0,0 +1 @@
+<p style="text-align: center;"><a href="https://codepen.io/{{ .Get "username" }}/pen/{{ .Get "id" }}" target="_blank" rel="noopener">Open this CodePen in a new window.</a></p>
diff --git a/layouts/shortcodes/codepen.atom.xml b/layouts/shortcodes/codepen.atom.xml
deleted file mode 120000
index fb1c8684..00000000
--- a/layouts/shortcodes/codepen.atom.xml
+++ /dev/null
@@ -1 +0,0 @@
-codepen.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/facebook.atom.atom b/layouts/shortcodes/facebook.atom.atom
new file mode 100644
index 00000000..24b34635
--- /dev/null
+++ b/layouts/shortcodes/facebook.atom.atom
@@ -0,0 +1,11 @@
+{{- $url := printf "https://www.facebook.com/plugins/post/oembed.json/?omitscript=1&url=%s" (.Get "url" | urlize) -}}
+{{- $json := getJSON $url -}}
+
+<div class="embed facebook">
+{{ $json.html | safeHTML }}
+</div>
+
+{{- define "__shortcode_facebook_js" }}
+<div id="fb-root"></div>
+<script async defer src="https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v5.0"></script>
+{{- end }}
diff --git a/layouts/shortcodes/facebook.atom.xml b/layouts/shortcodes/facebook.atom.xml
deleted file mode 120000
index babfdf6a..00000000
--- a/layouts/shortcodes/facebook.atom.xml
+++ /dev/null
@@ -1 +0,0 @@
-facebook.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/facebook.rss.xml b/layouts/shortcodes/facebook.rss.xml
deleted file mode 120000
index a315199f..00000000
--- a/layouts/shortcodes/facebook.rss.xml
+++ /dev/null
@@ -1 +0,0 @@
-facebook.html
\ No newline at end of file
diff --git a/layouts/shortcodes/facebook.rss.xml b/layouts/shortcodes/facebook.rss.xml
new file mode 100644
index 00000000..24b34635
--- /dev/null
+++ b/layouts/shortcodes/facebook.rss.xml
@@ -0,0 +1,11 @@
+{{- $url := printf "https://www.facebook.com/plugins/post/oembed.json/?omitscript=1&url=%s" (.Get "url" | urlize) -}}
+{{- $json := getJSON $url -}}
+
+<div class="embed facebook">
+{{ $json.html | safeHTML }}
+</div>
+
+{{- define "__shortcode_facebook_js" }}
+<div id="fb-root"></div>
+<script async defer src="https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v5.0"></script>
+{{- end }}
diff --git a/layouts/shortcodes/gh-buttons.atom.atom b/layouts/shortcodes/gh-buttons.atom.atom
new file mode 100644
index 00000000..dadfad22
--- /dev/null
+++ b/layouts/shortcodes/gh-buttons.atom.atom
@@ -0,0 +1,4 @@
+<p style="text-align: center;">
+  <a href="https://github.com/{{ .Get "username" }}/{{ .Get "repo" }}">Star {{ .Get "username" }}/{{ .Get "repo" }} on GitHub</a>&nbsp;&nbsp;&nbsp;
+  <a href="https://github.com/{{ .Get "username" }}/{{ .Get "repo" }}/issues">Issues for {{ .Get "username" }}/{{ .Get "repo" }} on GitHub</a>
+</p>
diff --git a/layouts/shortcodes/gh-buttons.atom.xml b/layouts/shortcodes/gh-buttons.atom.xml
deleted file mode 120000
index 94abf3fe..00000000
--- a/layouts/shortcodes/gh-buttons.atom.xml
+++ /dev/null
@@ -1 +0,0 @@
-gh-buttons.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/gist.atom.atom b/layouts/shortcodes/gist.atom.atom
new file mode 100644
index 00000000..bd22aa68
--- /dev/null
+++ b/layouts/shortcodes/gist.atom.atom
@@ -0,0 +1 @@
+<p style="text-align: center;"><a href="https://gist.github.com/{{ .Get "id" }}" target="_blank" rel="noopener">Open this GitHub Gist in a new window.</a></p>
diff --git a/layouts/shortcodes/gist.atom.xml b/layouts/shortcodes/gist.atom.xml
deleted file mode 120000
index 6dc7ff22..00000000
--- a/layouts/shortcodes/gist.atom.xml
+++ /dev/null
@@ -1 +0,0 @@
-gist.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/iframe.atom.atom b/layouts/shortcodes/iframe.atom.atom
new file mode 100644
index 00000000..f0448e6a
--- /dev/null
+++ b/layouts/shortcodes/iframe.atom.atom
@@ -0,0 +1,3 @@
+<div class="embed iframe">
+<iframe src="{{ .Get "src" }}" {{ with .Get "title" }}title="{{ . }}"{{ end }}></iframe>
+</div>
diff --git a/layouts/shortcodes/iframe.atom.xml b/layouts/shortcodes/iframe.atom.xml
deleted file mode 120000
index 39fa98c2..00000000
--- a/layouts/shortcodes/iframe.atom.xml
+++ /dev/null
@@ -1 +0,0 @@
-iframe.html
\ No newline at end of file
diff --git a/layouts/shortcodes/iframe.rss.xml b/layouts/shortcodes/iframe.rss.xml
deleted file mode 120000
index 39fa98c2..00000000
--- a/layouts/shortcodes/iframe.rss.xml
+++ /dev/null
@@ -1 +0,0 @@
-iframe.html
\ No newline at end of file
diff --git a/layouts/shortcodes/iframe.rss.xml b/layouts/shortcodes/iframe.rss.xml
new file mode 100644
index 00000000..f0448e6a
--- /dev/null
+++ b/layouts/shortcodes/iframe.rss.xml
@@ -0,0 +1,3 @@
+<div class="embed iframe">
+<iframe src="{{ .Get "src" }}" {{ with .Get "title" }}title="{{ . }}"{{ end }}></iframe>
+</div>
diff --git a/layouts/shortcodes/image.atom.atom b/layouts/shortcodes/image.atom.atom
new file mode 100644
index 00000000..05e72311
--- /dev/null
+++ b/layouts/shortcodes/image.atom.atom
@@ -0,0 +1,10 @@
+{{- $optimized := partial "functions/optimize-image" . -}}
+
+<p style="text-align: center;">
+{{ with .Get "link" }}<a href="{{ . }}">{{ end }}
+<img src="{{ $optimized.Permalink }}" width="{{ $optimized.Width }}" height="{{ $optimized.Height }}"
+     {{- with .Get "alt" }} alt="{{ . | safeHTML }}" title="{{ . | safeHTML }}"{{ end }}
+     {{- with .Inner }} alt="{{ . | $.Page.RenderString | plainify | safeHTML }}" title="{{ . | $.Page.RenderString | plainify | safeHTML }}"{{ end }}>
+{{ if .Get "link" }}</a>{{ end }}
+{{ with .Inner }}<br>{{ . | $.Page.RenderString | safeHTML }}{{ end -}}
+</p>
diff --git a/layouts/shortcodes/image.atom.xml b/layouts/shortcodes/image.atom.xml
deleted file mode 120000
index 6e5953a9..00000000
--- a/layouts/shortcodes/image.atom.xml
+++ /dev/null
@@ -1 +0,0 @@
-image.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/instagram.atom.atom b/layouts/shortcodes/instagram.atom.atom
new file mode 100644
index 00000000..539b6447
--- /dev/null
+++ b/layouts/shortcodes/instagram.atom.atom
@@ -0,0 +1 @@
+<p style="text-align: center;"><a href="https://www.instagram.com/p/{{ .Get "id" }}" target="_blank" rel="noopener">View this image on Instagram.</a></p>
diff --git a/layouts/shortcodes/instagram.atom.xml b/layouts/shortcodes/instagram.atom.xml
deleted file mode 120000
index 6e667426..00000000
--- a/layouts/shortcodes/instagram.atom.xml
+++ /dev/null
@@ -1 +0,0 @@
-instagram.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/tweet.atom.atom b/layouts/shortcodes/tweet.atom.atom
new file mode 100644
index 00000000..2ef2f714
--- /dev/null
+++ b/layouts/shortcodes/tweet.atom.atom
@@ -0,0 +1,6 @@
+{{- $url := printf "https://publish.twitter.com/oembed?lang=en&omit_script=true&dnt=true&align=center&url=%s" (index .Params 0 | safeURL) -}}
+{{- $json := getJSON $url -}}
+
+<div class="embed tweet">
+{{ $json.html | safeHTML }}
+</div>
diff --git a/layouts/shortcodes/tweet.atom.xml b/layouts/shortcodes/tweet.atom.xml
deleted file mode 120000
index dfa6f9f5..00000000
--- a/layouts/shortcodes/tweet.atom.xml
+++ /dev/null
@@ -1 +0,0 @@
-tweet.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/tweet.rss.xml b/layouts/shortcodes/tweet.rss.xml
deleted file mode 120000
index 1fe77a50..00000000
--- a/layouts/shortcodes/tweet.rss.xml
+++ /dev/null
@@ -1 +0,0 @@
-tweet.html
\ No newline at end of file
diff --git a/layouts/shortcodes/tweet.rss.xml b/layouts/shortcodes/tweet.rss.xml
new file mode 100644
index 00000000..2ef2f714
--- /dev/null
+++ b/layouts/shortcodes/tweet.rss.xml
@@ -0,0 +1,6 @@
+{{- $url := printf "https://publish.twitter.com/oembed?lang=en&omit_script=true&dnt=true&align=center&url=%s" (index .Params 0 | safeURL) -}}
+{{- $json := getJSON $url -}}
+
+<div class="embed tweet">
+{{ $json.html | safeHTML }}
+</div>
diff --git a/layouts/shortcodes/video.atom.atom b/layouts/shortcodes/video.atom.atom
new file mode 100644
index 00000000..683cba5a
--- /dev/null
+++ b/layouts/shortcodes/video.atom.atom
@@ -0,0 +1 @@
+<p>Your browser does not support HTML5 video. {{ with .Page.Resources.GetMatch (.Get "mp4") }}<a href="{{ .Permalink }}">Click to open the .mp4 video directly.</a>{{ end }}</p>
diff --git a/layouts/shortcodes/video.atom.xml b/layouts/shortcodes/video.atom.xml
deleted file mode 120000
index ca466f99..00000000
--- a/layouts/shortcodes/video.atom.xml
+++ /dev/null
@@ -1 +0,0 @@
-video.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/vimeo.atom.atom b/layouts/shortcodes/vimeo.atom.atom
new file mode 100644
index 00000000..74ab376f
--- /dev/null
+++ b/layouts/shortcodes/vimeo.atom.atom
@@ -0,0 +1 @@
+<p style="text-align: center;"><a href="https://vimeo.com/{{ .Get "id" }}" target="_blank" rel="noopener">Watch this video on Vimeo.</a></p>
diff --git a/layouts/shortcodes/vimeo.atom.xml b/layouts/shortcodes/vimeo.atom.xml
deleted file mode 120000
index 99cc4d5c..00000000
--- a/layouts/shortcodes/vimeo.atom.xml
+++ /dev/null
@@ -1 +0,0 @@
-vimeo.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/youtube.atom.atom b/layouts/shortcodes/youtube.atom.atom
new file mode 100644
index 00000000..5c5da0db
--- /dev/null
+++ b/layouts/shortcodes/youtube.atom.atom
@@ -0,0 +1 @@
+<p style="text-align: center;"><a href="https://www.youtube.com/watch?v={{ index .Params 0 }}" target="_blank" rel="noopener">Watch this video on YouTube.</a></p>
diff --git a/layouts/shortcodes/youtube.atom.xml b/layouts/shortcodes/youtube.atom.xml
deleted file mode 120000
index 40ab488e..00000000
--- a/layouts/shortcodes/youtube.atom.xml
+++ /dev/null
@@ -1 +0,0 @@
-youtube.rss.xml
\ No newline at end of file
diff --git a/netlify.toml b/netlify.toml
index 2687b6ee..9353ee18 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -7,7 +7,7 @@
   NODE_VERSION = "14"
   YARN_VERSION = "1.22.4"
   YARN_FLAGS = "--no-ignore-optional --frozen-lockfile"
-  GO_VERSION = "1.14.5"
+  GO_VERSION = "1.14.6"
 
 # Ensure *only* Pretty URLs are enabled, even though this is already set up in
 # the Netlify dashboard.
diff --git a/yarn.lock b/yarn.lock
index 5492b000..1976067c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1762,14 +1762,14 @@ camelcase@^6.0.0:
   integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
 
 caniuse-db@^1.0.30001090:
-  version "1.0.30001102"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001102.tgz#28e7da3f2969781728a0f50119a7aca179bf9e72"
-  integrity sha512-VUH/Ch7IaLSmugVKMTQEJlvSUAezLQY0uo1OZ6TJryWDln5vt/QrJjj+h/fVTuhUfYFc4pqfIc0u9ENn+vUy/g==
+  version "1.0.30001103"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001103.tgz#9166b10f1b4a3fa2e3375b9923cb203c49b5538b"
+  integrity sha512-CUcBkIV20SyOpH685l6LmFU3aSRPD3Cyq9LRAMjLJtYVbyhxlJ902Pu47rzWZ4hjby/yFuorbhRhEI/QDKigFA==
 
 caniuse-lite@^1.0.30000887, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001097:
-  version "1.0.30001102"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001102.tgz#3275e7a8d09548f955f665e532df88de0b63741a"
-  integrity sha512-fOjqRmHjRXv1H1YD6QVLb96iKqnu17TjcLSaX64TwhGYed0P1E1CCWZ9OujbbK4Z/7zax7zAzvQidzdtjx8RcA==
+  version "1.0.30001103"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001103.tgz#fe81536d075b97cd013d4988c9212418faa289a8"
+  integrity sha512-EJkTPrZrgy712tjZ7GQDye5A67SQOyNS6X9b6GS/e5QFu5Renv5qfkx3GHq1S+vObxKzbWWYuPO/7nt4kYW/gA==
 
 caw@^2.0.0, caw@^2.0.1:
   version "2.0.1"
@@ -1931,9 +1931,9 @@ cli-cursor@^3.1.0:
     restore-cursor "^3.1.0"
 
 cli-spinners@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.3.0.tgz#0632239a4b5aa4c958610142c34bb7a651fc8df5"
-  integrity sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.4.0.tgz#c6256db216b878cfba4720e719cec7cf72685d7f"
+  integrity sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==
 
 cli-truncate@2.1.0, cli-truncate@^2.1.0:
   version "2.1.0"
@@ -2686,9 +2686,9 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.488:
-  version "1.3.499"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.499.tgz#06949f19877dafa42915e57dfeb4c1cfb86a8649"
-  integrity sha512-y7FwtQm/8xuLMnYQfBQDYzCpNn+VkSnf4c3Km5TWMNXg7JA5RQBuxmcLaKdDVcIK0K5xGIa7TlxpRt4BdNxNoA==
+  version "1.3.501"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.501.tgz#faa17a2cb0105ee30d5e1ca87eae7d8e85dd3175"
+  integrity sha512-tyzuKaV2POw2mtqBBzQGNBojMZzH0MRu8bT8T/50x+hWeucyG/9pkgAATy+PcM2ySNM9+8eG2VllY9c6j4i+bg==
 
 elliptic@^6.0.0, elliptic@^6.5.2:
   version "6.5.3"
@@ -4736,9 +4736,9 @@ lint-staged@^10.2.11:
     stringify-object "^3.3.0"
 
 listr2@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.2.0.tgz#cb88631258abc578c7fb64e590fe5742f28e4aac"
-  integrity sha512-Q8qbd7rgmEwDo1nSyHaWQeztfGsdL6rb4uh7BA+Q80AZiDET5rVntiU1+13mu2ZTDVaBVbvAD1Db11rnu3l9sg==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.2.1.tgz#3a0abf78a7a9d9fb4121a541b524cb52e8dcbbba"
+  integrity sha512-WhuhT7xpVi2otpY/OzJJ8DQhf6da8MjGiEhMdA9oQquwtsSfzZt+YKlasUBer717Uocd0oPmbPeiTD7MvGzctw==
   dependencies:
     chalk "^4.0.0"
     cli-truncate "^2.1.0"
@@ -5699,9 +5699,9 @@ optipng-bin@^6.0.0:
     logalot "^2.0.0"
 
 ora@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.4.tgz#e8da697cc5b6a47266655bf68e0fb588d29a545d"
-  integrity sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-4.0.5.tgz#7410b5cc2d99fa637fd5099bbb9f02bfbb5a361e"
+  integrity sha512-jCDgm9DqvRcNIAEv2wZPrh7E5PcQiDUnbnWbAfu4NGAE2ZNqPFbDixmWldy1YG2QfLeQhuiu6/h5VRrk6cG50w==
   dependencies:
     chalk "^3.0.0"
     cli-cursor "^3.1.0"