diff --git a/themes/gohugoioTheme/archetypes/default.md b/themes/gohugoioTheme/archetypes/default.md
deleted file mode 100644
index f30f01f74..000000000
--- a/themes/gohugoioTheme/archetypes/default.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-linktitle: ""
-description: ""
-godocref: ""
-publishdate: ""
-lastmod: ""
-categories: []
-tags: []
-weight: 00
-slug: ""
-aliases: []
-toc: false
----
\ No newline at end of file
diff --git a/themes/gohugoioTheme/archetypes/functions.md b/themes/gohugoioTheme/archetypes/functions.md
deleted file mode 100644
index 0a5dd344f..000000000
--- a/themes/gohugoioTheme/archetypes/functions.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-linktitle: ""
-description: ""
-godocref: ""
-publishdate: ""
-lastmod: ""
-categories: [functions]
-tags: []
-ns: ""
-signature: []
-workson: []
-hugoversion: ""
-aliases: []
-relatedfuncs: []
-toc: false
-deprecated: false
----
\ No newline at end of file
diff --git a/themes/gohugoioTheme/archetypes/showcase.md b/themes/gohugoioTheme/archetypes/showcase.md
deleted file mode 100644
index 562fb9e8e..000000000
--- a/themes/gohugoioTheme/archetypes/showcase.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-description: ""
-lastmod: ""
-license: ""
-licenseLink: ""
-sitelink: ""
-sourcelink: ""
-categories: [showcase]
-tags: []
-image: ""
-toc: false
-notesforauthors: "Go to gohugo.io/contribute/documentation for more info"
----
\ No newline at end of file
diff --git a/themes/gohugoioTheme/archetypes/tutorials.md b/themes/gohugoioTheme/archetypes/tutorials.md
deleted file mode 100644
index 0a3540c0f..000000000
--- a/themes/gohugoioTheme/archetypes/tutorials.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-linktitle: ""
-description: ""
-godocref: ""
-publishdate: ""
-lastmod: ""
-categories: [tutorials]
-tags: []
-author: ""
-authorurl: ""
-originalurl: ""
-draft: false
-aliases: []
-notesforauthors: "Go to gohugo.io/contribute/documentation for more info."
----
-
diff --git a/themes/gohugoioTheme/layouts/_default/baseof.html b/themes/gohugoioTheme/layouts/_default/baseof.html
index fb09c0db4..d6c854db0 100755
--- a/themes/gohugoioTheme/layouts/_default/baseof.html
+++ b/themes/gohugoioTheme/layouts/_default/baseof.html
@@ -9,7 +9,7 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
      {{/* NOTE: the Site's title, and if there is a page title, that is set too */}}
-    <title>{{ block "title" . }}{{ .Site.Title }} {{ with .Title }} | {{ . }}{{ end }}{{ end }}</title>
+    <title>{{ block "title" . }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }}</title>
     <meta name="HandheldFriendly" content="True">
     <meta name="MobileOptimized" content="320">
 
@@ -27,7 +27,7 @@
       {{- template "_internal/opengraph.html" . -}}
       {{- template "_internal/google_news.html" . -}}
       {{- template "_internal/schema.html" . -}}
-      {{- partial "twitter_cards.html" . -}}
+      {{- template "_internal/twitter_cards.html" . -}}
 
       {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production")  }}
         {{ template "_internal/google_analytics_async.html" . }}
diff --git a/themes/gohugoioTheme/layouts/partials/twitter_cards.html b/themes/gohugoioTheme/layouts/partials/twitter_cards.html
deleted file mode 100644
index d719937df..000000000
--- a/themes/gohugoioTheme/layouts/partials/twitter_cards.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{{- with $.Param "images" -}}
-<meta name="twitter:card" content="summary_large_image"/>
-<meta name="twitter:image:src" content="{{ index . 0 | absURL }}"/>
-{{ else -}}
-<meta name="twitter:card" content="summary"/>
-{{- end -}}
-<meta name="twitter:title" content="{{ .Title }}"/>
-<meta name="twitter:description" content="{{ with .Description }}{{ . }}{{ else }}{{if .IsPage}}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end -}}"/>
-{{ with .Site.Social.twitter -}}
-<meta name="twitter:site" content="@{{ . }}"/>
-{{ end -}}
-{{ range .Site.Authors }}
-{{ with .twitter -}}
-<meta name="twitter:creator" content="@{{ . }}"/>
-{{ end -}}
-{{ end -}}
-