diff --git a/config.toml b/config.toml
index 08c72176f..badb02781 100644
--- a/config.toml
+++ b/config.toml
@@ -25,7 +25,7 @@ pygmentsCodeFences = true
 pygmentsStyle = "friendly"
 
 [outputs]
-home = [ "HTML", "RSS", "REDIR" ]
+home = [ "HTML", "RSS", "REDIR", "HEADERS" ]
 section = [ "HTML", "RSS"]
 
 [mediaTypes]
@@ -39,7 +39,11 @@ mediatype = "text/netlify"
 baseName = "_redirects"
 isPlainText = true
 notAlternative = true
-
+[outputFormats.HEADERS]
+mediatype = "text/netlify"
+baseName = "_headers"
+isPlainText = true
+notAlternative = true
 
 [social]
 twitter = "GoHugoIO"
diff --git a/static/_headers b/static/_headers
deleted file mode 100644
index 1216e42d4..000000000
--- a/static/_headers
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-  X-Frame-Options: DENY
-  X-XSS-Protection: 1; mode=block
-  X-Content-Type-Options: nosniff
-  Referrer-Policy: origin-when-cross-origin
diff --git a/themes/gohugoioTheme b/themes/gohugoioTheme
index a12544f00..ce4449747 160000
--- a/themes/gohugoioTheme
+++ b/themes/gohugoioTheme
@@ -1 +1 @@
-Subproject commit a12544f00e3f50450eae1c1108c71eefb71f327f
+Subproject commit ce4449747bb1867d7d8b0c579be2ddf4a040274c