diff --git a/.gitmodules b/.gitmodules
index 02ee5dd4e..9923a2c95 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "themes/gohugo-theme"]
-	path = themes/gohugo-theme
-	url = https://github.com/budparr/gohugo-theme.git
+[submodule "themes/gohugoioTheme"]
+	path = themes/gohugoioTheme
+	url = https://github.com/gohugoio/gohugoioTheme.git
diff --git a/config.toml b/config.toml
index d7706de91..b616f5029 100644
--- a/config.toml
+++ b/config.toml
@@ -31,7 +31,7 @@ stepAnalysis = true
 title = "Hugo"
 
 # Change this once you've created your theme
-theme = "gohugo-theme"
+theme = "gohugoioTheme"
 
 # Set to true to convert mysite/section/ to mysite/section.html
 uglyURLs = false
diff --git a/content/content-management/archetypes.md b/content/content-management/archetypes.md
index 45833d9f2..a8917e3db 100644
--- a/content/content-management/archetypes.md
+++ b/content/content-management/archetypes.md
@@ -180,7 +180,7 @@ As an example of archetypes in practice, the following is the `functions` archet
 
 {{% code file="archetypes/functions.md" %}}
 ```yaml
-{{< readfile file="/themes/gohugo-theme/archetypes/functions.md" >}}
+{{< readfile file="/themes/gohugoioTheme/archetypes/functions.md" >}}
 ```
 {{% /code %}}
 
diff --git a/content/contribute/documentation.md b/content/contribute/documentation.md
index a6673911b..83d1558de 100644
--- a/content/contribute/documentation.md
+++ b/content/contribute/documentation.md
@@ -56,7 +56,7 @@ The archetype for `functions` according to the Hugo theme is as follows:
 
 {{% code file="archetypes/functions.md" %}}
 ```yaml
-{{< readfile file="/themes/gohugo-theme/archetypes/functions.md">}}
+{{< readfile file="/themes/gohugoioTheme/archetypes/functions.md">}}
 ```
 {{% /code %}}
 
@@ -108,7 +108,7 @@ The archetype for the `tutorials` content type is as follows:
 
 {{% code file="archetypes/tutorials.md" %}}
 ```yaml
-{{< readfile file="/themes/gohugo-theme/archetypes/tutorials.md">}}
+{{< readfile file="/themes/gohugoioTheme/archetypes/tutorials.md">}}
 ```
 {{% /code %}}
 
diff --git a/content/templates/files.md b/content/templates/files.md
index fae14df99..dc850df3e 100644
--- a/content/templates/files.md
+++ b/content/templates/files.md
@@ -38,7 +38,7 @@ This shortcode creates a link to each of the files in a directory---display as t
 
 {{% code file="layouts/shortcodes/directoryindex.html" download="directoryindex.html" %}}
 ```html
-{{< readfile file="/themes/gohugo-theme/layouts/shortcodes/directoryindex.html" >}}
+{{< readfile file="/themes/gohugoioTheme/layouts/shortcodes/directoryindex.html" >}}
 ```
 {{% /code %}}
 
@@ -50,7 +50,7 @@ You can then call the shortcode as follows inside of your content's markup:
 
 The above shortcode [is part of the code for the Hugo docs][dirindex]. Here it lists this site's CSS files:
 
-{{< directoryindex path="/themes/gohugo-theme/static/dist" pathURL="/css" >}}
+{{< directoryindex path="/themes/gohugoioTheme/static/dist" pathURL="/css" >}}
 
 {{% note "Slashes are Important" %}}
 The initial slash `/` in `pathURL` is important in the `directoryindex` shortcode. Otherwise, `pathURL` becomes relative to the current web page.
@@ -82,7 +82,7 @@ Here is the templating for our new `readfile` shortcode:
 
 {{% code file="layouts/shortcodes/readfile.html" download="readfile.html" %}}
 ```
-{{< readfile file="/themes/gohugo-theme/layouts/shortcodes/readfile.html">}}
+{{< readfile file="/themes/gohugoioTheme/layouts/shortcodes/readfile.html">}}
 ```
 {{% /code %}}
 
diff --git a/themes/gohugo-theme b/themes/gohugo-theme
deleted file mode 160000
index cc0576b79..000000000
--- a/themes/gohugo-theme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cc0576b7982694e5b3b8c7ba0ec9ac31c504ee49
diff --git a/themes/gohugoioTheme b/themes/gohugoioTheme
new file mode 160000
index 000000000..e0fa55481
--- /dev/null
+++ b/themes/gohugoioTheme
@@ -0,0 +1 @@
+Subproject commit e0fa554815f403e973151ec84d958a63f46829fa