diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index c4d8890..07ae27a 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,32 +1,25 @@
 {{ define "main" }}
-<div class="article-meta">
-<h1 class="center-text">{{ .Title | markdownify }}</h1>
-{{ $authors := .Params.authors | default (slice .Site.Params.defaultAuthor) }}
-<a class="center-text" href={{ printf "/%s/%s" "authors" (index $authors 0 | urlize) }}><h2 class="center-text">{{ index $authors 0 }}</h2></a>
-{{ if .Params.date }}<h2 class="small-text">{{ .Date.Format "Mon | Jan 2, 2006" }}</h2>{{ end }}
-{{ range (.GetTerms "tags") }}
-	<a class="small-text" href="{{ .Permalink }}">{{ .LinkTitle }}</a>
-{{ end}}
-	{{ partial "responsive-image.html" (dict "context" . "class" "shadow large-image") }}
-</div>
 
-{{ if .Params.toc }}
-{{ .TableOfContents }}
-{{ end }}
-<div class="content-wrapper">
-  <main>
-    {{ .Content }}
-    <p>
-  		{{ with .NextInSection }}
-    		<b>Next: </b><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
-    		<br>
-  		{{ end }}
-  		{{ with .PrevInSection }}
-    		<b>Previous: </b><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
-    		<br>
-  		{{ end }}
-      <b><a href="/"> >> Home</a></b>
-		</p>
-  </main>
-</div>
+	{{ partial "article-meta.html" . }}
+
+    {{ if .Params.toc }}
+        {{ .TableOfContents }}
+    {{ end }}
+
+    <div class="content-wrapper">
+      <main>
+        {{ .Content }}
+        <p>
+      		{{ with .NextInSection }}
+        		<b>Next: </b><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
+        		<br>
+      		{{ end }}
+      		{{ with .PrevInSection }}
+        		<b>Previous: </b><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a>
+        		<br>
+      		{{ end }}
+          <b><a href="/"> >> Home</a></b>
+    		</p>
+      </main>
+    </div>
 {{ end }}
diff --git a/layouts/games/list.html b/layouts/games/list.html
index 013fc29..2df9e23 100644
--- a/layouts/games/list.html
+++ b/layouts/games/list.html
@@ -1,17 +1,6 @@
 {{ define "main" }}
-<div class="article-meta">
-<h1 class="center-text">{{ .Title | markdownify }}</h1>
-{{ $authors := .Params.authors | default (slice .Site.Params.defaultAuthor) }}
-<a class="center-text" href={{ printf "/%s/%s" "authors" (index $authors 0 | urlize) }}><h2 class="center-text">{{ index $authors 0 }}</h2></a>
-{{ if .Params.releaseDate }}<h2 class="small-text">Released {{ dateFormat "Mon | Jan 2, 2006" .Params.releaseDate }}</h2>{{ end }}
-{{ range (.GetTerms "tags") }}
-	<a class="small-text" href="{{ .Permalink }}">{{ .LinkTitle }}</a>
-{{ end }}
-	<div class="break"></div>
-		<h2 class="small-text">Platforms:</h2>
-		<span class="margin small-text">{{ delimit .Params.platforms " · " }}</span>
-		{{ partial "responsive-image.html" (dict "context" . "class" "shadow fill-wh") }}
-</div>
+
+{{ partial "article-meta.html" . }}
 
 {{ if .Params.toc }}
 {{ .TableOfContents }}