diff --git a/config.toml b/config.toml
index 249872f50..0e0eedb63 100644
--- a/config.toml
+++ b/config.toml
@@ -29,6 +29,7 @@ relativeURLs = true
 stepAnalysis = true
 # This is the top-level, global site title
 title = "Hugo"
+theme = "gohugoioTheme"
 
 # Change this once you've created your theme
 
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
deleted file mode 100644
index 42ca8565c..000000000
--- a/layouts/_default/baseof.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-    <link rel="stylesheet" href="/css/style.min.css">
-    <title>Hugo Docs is Moving</title>
-    <style>
-    html,
-    body {
-        min-width: 100vw;
-        max-width: 100vw;
-        font-size:16px;
-    }
-    
-    *,
-    *:before,
-    *:after {
-        font-family: 'Avenir', 'Avenir Next', 'helvetica neue';
-    }
-    main,.main {
-        display:block;
-        width:90%;
-        margin-left:auto;
-        margin-right:auto;
-        min-height:90vh;
-        max-width:800px;
-    }
-
-    p {
-        margin-top:2em;
-    }
-    </style>
-</head>
-
-<body>
-    <main>
-    {{ block "main" . }}
-    {{ partial "temp-closing.html" . }}
-    {{ end }}
-    </main>
-</body>
-
-</html>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
deleted file mode 100644
index 2c447e83c..000000000
--- a/layouts/_default/list.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ define "main" }}
-{{ partial "temp-closing.html" . }}
-{{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
deleted file mode 100644
index 2c447e83c..000000000
--- a/layouts/_default/single.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ define "main" }}
-{{ partial "temp-closing.html" . }}
-{{ end }}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
deleted file mode 100644
index 2c447e83c..000000000
--- a/layouts/_default/taxonomy.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ define "main" }}
-{{ partial "temp-closing.html" . }}
-{{ end }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
deleted file mode 100644
index 2c447e83c..000000000
--- a/layouts/_default/terms.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ define "main" }}
-{{ partial "temp-closing.html" . }}
-{{ end }}
diff --git a/layouts/index.html b/layouts/index.html
deleted file mode 100644
index e4e4a83b8..000000000
--- a/layouts/index.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ define "main" }}
-{{ end }}
diff --git a/layouts/partials/temp-closing.html b/layouts/partials/temp-closing.html
deleted file mode 100644
index 5ff91e6e6..000000000
--- a/layouts/partials/temp-closing.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<header>
-    <h1>Hugodocs.info is moving...</h1>
-    <p>We appreciate your patience as we migrate the content from hugodocs.info to the new GitHub organization for Hugo. To check the currently published, <em>official</em> documentation, visit <a href="https://gohugo.io">https://gohugo.io</a>. Stay tuned for the rollout of the new docs, and thank you for your support of Hugo!</p>
-</header>
