diff --git a/config/_default/config.toml b/config/_default/config.toml
index a44fe91..b8740b2 100644
--- a/config/_default/config.toml
+++ b/config/_default/config.toml
@@ -22,32 +22,70 @@ summaryLength = 0
 #[outputs]
 #  home = ["HTML", "RSS", "JSON"]
 
+# removed for now
+# [mediaTypes]
+#   [mediaTypes."application/atom"]
+#     suffixes     = ["xml"]
+#
+# [outputFormats.Atom]
+#   mediaType      = "application/atom"
+#   baseName       = "index"
+#   isPlainText    = false
+#
+# [outputFormats.HumansTXT]
+#   mediaType      = "text/plain"
+#   baseName       = "humans"
+#   isPlainText    = true
+#   notAlternative = true
+#
+# [outputFormats.Tootpick]
+#   mediaType      = "text/html"
+#   basename       = "tootpick"
+#   isPlainText    = false
+#   isHTML         = true
+#   notAlternative = true
+#
+# [outputs]
+#   home = [ "HTML", "Atom", "JSON", "HumansTXT", "Tootpick" ]
+#   page = ["HTML"]
+#   section = ["HTML", "Atom"]
+#   # taxonomyTerm = ["HTML"]
+#   taxonomy = ["HTML"]
+
+# https://discourse.gohugo.io/t/atom-and-json-feeds/13572
+disableKinds = ["RSS"]  # kick out RSS
+
 [mediaTypes]
-  [mediaTypes."application/atom"]
-    suffixes     = ["xml"]
-
-[outputFormats.Atom]
-  mediaType      = "application/atom"
-  baseName       = "index"
-  isPlainText    = false
-
-[outputFormats.HumansTXT]
-  mediaType      = "text/plain"
-  baseName       = "humans"
-  isPlainText    = true
-  notAlternative = true
-
-[outputFormats.Tootpick]
-  mediaType      = "text/html"
-  basename       = "tootpick"
-  isPlainText    = false
-  isHTML         = true
-  notAlternative = true
+  [mediaTypes."application/atom+xml"]
+    suffixes = ["xml"]
 
-[outputs]
-  home = [ "HTML", "Atom", "JSON", "HumansTXT", "Tootpick" ]
-  page = ["HTML"]
-  section = ["HTML", "Atom"]
-  # taxonomyTerm = ["HTML"]
-  taxonomy = ["HTML"]
 
+[outputFormats.HTML]
+baseName              = "index"
+NoUgly                = true
+
+
+[outputFormats.ATOM]
+MediaType             = "application/atom+xml"
+BaseName              = "feed"
+suffix                = "xml"
+IsHTML                = false
+IsPlainText           = false
+noUgly                = true
+Rel                   = "alternate"
+
+[outputFormats.JSON]
+MediaType             = "application/json"
+BaseName              = "feed"
+suffix                = "json"
+IsHTML                = false
+IsPlainText           = true
+noUgly                = false
+Rel                   = "alternate"
+
+[outputs]
+home                  = [ "HTML", "ATOM", "JSON"]
+section               = [ "HTML",  ]
+page                  = [ "HTML" ]
+taxonomy              = [ "HTML" ]
+taxonomyTerm          = [ "HTML" ]
diff --git a/layouts/index.atom.xml b/layouts/_default/home.atom.xml
similarity index 100%
rename from layouts/index.atom.xml
rename to layouts/_default/home.atom.xml