diff --git a/layouts/index.atom b/layouts/index.atom
index cc329665..1659a748 100644
--- a/layouts/index.atom
+++ b/layouts/index.atom
@@ -1,21 +1,24 @@
 {{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
-<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="{{ .Site.LanguageCode }}">
+<feed xmlns="http://www.w3.org/2005/Atom">
   <title>{{ .Site.Title }}</title>
-  <id>{{ "/" | absLangURL }}</id>
+  <id>{{ .Permalink }}</id>
   <author>
     <name>{{ .Site.Title }}</name>
     <uri>{{ .Permalink }}</uri>
   </author>
   <generator>Hugo -- gohugo.io</generator>
+  {{- with .Site.Copyright }}
+  <rights>{{ . }}</rights>
+  {{- end }}
   {{- with .Site.Params.defaultImage }}
   <logo>{{ . | absURL }}</logo>
   {{- end }}
-  <updated>{{ dateFormat "2006-01-02T15:04:05Z" now.UTC | safeHTML }}</updated>
+  <updated>{{ .Date.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated>
   {{- with .OutputFormats.Get "ATOM" }}
-  {{ printf `<link rel="self" type="%s" href="%s" />` .MediaType.Type .Permalink $.Site.LanguageCode | safeHTML }}
+  {{ printf `<link rel="self" type="%s" href="%s" />` .MediaType.Type .Permalink | safeHTML }}
   {{- end }}
   {{- range .AlternativeOutputFormats }}
-  {{ printf `<link rel="alternate" type="%s" href="%s" />` .MediaType.Type .Permalink $.Site.LanguageCode | safeHTML }}
+  {{ printf `<link rel="alternate" type="%s" href="%s" />` .MediaType.Type .Permalink | safeHTML }}
   {{- end }}
   {{- range (where .Site.RegularPages "Section" "notes") }}
   <entry>
@@ -27,7 +30,8 @@
     </author>
     {{- end }}
     <id>{{ .Permalink }}</id>
-    <published>{{ dateFormat "2006-01-02T15:04:05Z" .Date.UTC | safeHTML }}</published>
+    <published>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</published>
+    <updated>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated>
     <content type="html">
 {{ .Content | html }}
     </content>
diff --git a/layouts/shortcodes/codepen.atom.xml b/layouts/shortcodes/codepen.atom.xml
new file mode 120000
index 00000000..fb1c8684
--- /dev/null
+++ b/layouts/shortcodes/codepen.atom.xml
@@ -0,0 +1 @@
+codepen.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/facebook.atom.xml b/layouts/shortcodes/facebook.atom.xml
new file mode 120000
index 00000000..babfdf6a
--- /dev/null
+++ b/layouts/shortcodes/facebook.atom.xml
@@ -0,0 +1 @@
+facebook.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/gh-buttons.atom.xml b/layouts/shortcodes/gh-buttons.atom.xml
new file mode 120000
index 00000000..94abf3fe
--- /dev/null
+++ b/layouts/shortcodes/gh-buttons.atom.xml
@@ -0,0 +1 @@
+gh-buttons.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/gist.atom.xml b/layouts/shortcodes/gist.atom.xml
new file mode 120000
index 00000000..6dc7ff22
--- /dev/null
+++ b/layouts/shortcodes/gist.atom.xml
@@ -0,0 +1 @@
+gist.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/image.atom.xml b/layouts/shortcodes/image.atom.xml
new file mode 120000
index 00000000..6e5953a9
--- /dev/null
+++ b/layouts/shortcodes/image.atom.xml
@@ -0,0 +1 @@
+image.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/instagram.atom.xml b/layouts/shortcodes/instagram.atom.xml
new file mode 120000
index 00000000..6e667426
--- /dev/null
+++ b/layouts/shortcodes/instagram.atom.xml
@@ -0,0 +1 @@
+instagram.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/tweet.atom.xml b/layouts/shortcodes/tweet.atom.xml
new file mode 120000
index 00000000..dfa6f9f5
--- /dev/null
+++ b/layouts/shortcodes/tweet.atom.xml
@@ -0,0 +1 @@
+tweet.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/video.atom.xml b/layouts/shortcodes/video.atom.xml
new file mode 120000
index 00000000..ca466f99
--- /dev/null
+++ b/layouts/shortcodes/video.atom.xml
@@ -0,0 +1 @@
+video.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/vimeo.atom.xml b/layouts/shortcodes/vimeo.atom.xml
new file mode 120000
index 00000000..99cc4d5c
--- /dev/null
+++ b/layouts/shortcodes/vimeo.atom.xml
@@ -0,0 +1 @@
+vimeo.rss.xml
\ No newline at end of file
diff --git a/layouts/shortcodes/youtube.atom.xml b/layouts/shortcodes/youtube.atom.xml
new file mode 120000
index 00000000..40ab488e
--- /dev/null
+++ b/layouts/shortcodes/youtube.atom.xml
@@ -0,0 +1 @@
+youtube.rss.xml
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index e0206030..de730676 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1613,9 +1613,9 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.390:
-  version "1.3.397"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.397.tgz#db640c2e67b08d590a504c20b56904537aa2bafa"
-  integrity sha512-zcUd1p/7yzTSdWkCTrqGvbnEOASy96d0RJL/lc5BDJoO23Z3G/VHd0yIPbguDU9n8QNUTCigLO7oEdtOb7fp2A==
+  version "1.3.398"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.398.tgz#4c01e29091bf39e578ac3f66c1f157d92fa5725d"
+  integrity sha512-BJjxuWLKFbM5axH3vES7HKMQgAknq9PZHBkMK/rEXUQG9i1Iw5R+6hGkm6GtsQSANjSUrh/a6m32nzCNDNo/+w==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"