diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index adc8874..bee73c6 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,7 +3,7 @@
 {{- end -}}
 
 {{ define "content" -}}
-    {{ partial "list_content.html" . }}
+    {{ partial "content_list.html" . }}
 {{- end -}}
 
 {{ define "footer" -}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index e91d36e..8159690 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -3,9 +3,9 @@
 {{- end -}}
 
 {{ define "content" -}}
-    {{ partial "post_content.html" . }}
+    {{ partial "content_single.html" . }}
 {{- end -}}
 
 {{ define "footer" -}}
-    {{ partial "post_footer.html" . }}
+    {{ partial "commenting.html" . }}
 {{- end -}}
diff --git a/layouts/partials/code_header.html b/layouts/partials/code_header.html
deleted file mode 100644
index c7db1a0..0000000
--- a/layouts/partials/code_header.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<link href="http://gmpg.org/xfn/11" rel="profile">
-<meta charset="utf-8">
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-{{ with .Site.Params.meta.description }}<meta name="description" content="{{ . }}">{{ end }}
-{{ with .Site.Params.meta.keywords }}<meta name="keywords" content="{{.}}">{{ end }}	
-{{ .Hugo.Generator }}
-<!-- Enable responsiveness on mobile devices-->
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
-{{ if .IsHome -}}
-    <title>{{ .Site.Title }}</title>
-{{- else -}}
-    <title>{{ .Title }} &middot; {{ .Site.Title }}</title>
-{{- end }}
-<!-- CSS -->
-<link rel="stylesheet" href="{{ .Site.BaseURL }}css/print.css" media="print">
-<link rel="stylesheet" href="{{ .Site.BaseURL }}css/poole.css">
-<link rel="stylesheet" href="{{ .Site.BaseURL }}css/hyde.css">
-<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Fira+Sans:300,300i,400,400i,500">
-<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-<!-- Grid Syntax -->
-<link rel="stylesheet" href="{{ .Site.BaseURL }}css/grid.css">
-
-<!-- Customised CSS -->
-<link rel="stylesheet" href="{{ .Site.BaseURL }}css/custom.css">
-
-<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-<!--[if lt IE 9]>
-<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-<![endif]-->
-<!-- Icons -->
-<link rel="apple-touch-icon-precomposed" sizes="144x144" href="/apple-touch-icon-144-precomposed.png">
-<link rel="shortcut icon" href="/favicon.png">
-<!-- RSS -->
-<link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
diff --git a/layouts/partials/post_footer.html b/layouts/partials/commenting.html
similarity index 53%
rename from layouts/partials/post_footer.html
rename to layouts/partials/commenting.html
index 870e307..0c4fa77 100644
--- a/layouts/partials/post_footer.html
+++ b/layouts/partials/commenting.html
@@ -12,17 +12,8 @@
 {{ if .Site.DisqusShortname -}}
     {{ if ne .Params.showcomments false }}
         <h2>Comments</h2>
-        {{ partial "post_disqus.html" . }}
+        {{ partial "commenting_disqus.html" . }}
     {{ end }}  
 {{ else if .Site.Params.GraphCommentId -}}
-<div id="graphcomment"></div>
-<script type="text/javascript">
-  window.graphcomment_id = '{{ .Site.Params.GraphCommentId }}';
-  /* - - - DON'T EDIT BELOW THIS LINE - - - */
-  (function() {
-    var gc = document.createElement('script'); gc.type = 'text/javascript'; gc.async = true;
-    gc.src = 'https://graphcomment.com/js/integration.js';
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(gc);
-  })();
-</script>
+    {{ partial "commenting_graph.html" . }}
 {{- end }}
\ No newline at end of file
diff --git a/layouts/partials/post_disqus.html b/layouts/partials/commenting_disqus.html
similarity index 100%
rename from layouts/partials/post_disqus.html
rename to layouts/partials/commenting_disqus.html
diff --git a/layouts/partials/commenting_graph.html b/layouts/partials/commenting_graph.html
new file mode 100644
index 0000000..a2843f7
--- /dev/null
+++ b/layouts/partials/commenting_graph.html
@@ -0,0 +1,10 @@
+<div id="graphcomment"></div>
+<script type="text/javascript">
+  window.graphcomment_id = '{{ .Site.Params.GraphCommentId }}';
+  /* - - - DON'T EDIT BELOW THIS LINE - - - */
+  (function() {
+    var gc = document.createElement('script'); gc.type = 'text/javascript'; gc.async = true;
+    gc.src = 'https://graphcomment.com/js/integration.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(gc);
+  })();
+</script>
\ No newline at end of file
diff --git a/layouts/partials/list_content.html b/layouts/partials/content_list.html
similarity index 100%
rename from layouts/partials/list_content.html
rename to layouts/partials/content_list.html
diff --git a/layouts/partials/post_content.html b/layouts/partials/content_single.html
similarity index 100%
rename from layouts/partials/post_content.html
rename to layouts/partials/content_single.html