diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 89ebb3a..632ec60 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,7 +3,7 @@
 {{- end -}}
 
 {{ define "content" -}}
-    {{ partial "page_list.html" . }}
+    {{ partial "page-list.html" . }}
 {{- end -}}
 
 {{ define "footer" -}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index b6a6af6..cc4f463 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,9 +1,10 @@
 {{ define "header" -}}
+    {{ partial "page-variables-init.html" . }}
     {{ partial "header.html" . }}
 {{- end -}}
 
 {{ define "content" -}}
-    {{ partial "page_single.html" . }}
+    {{ partial "page-single.html" . }}
 {{- end -}}
 
 {{ define "footer" -}}
@@ -12,4 +13,5 @@
         {{- partial "commenting.html" . -}}
     </div>
     {{ partial "footer.html" . }}
+    {{ partial "page-variables-deinit.html" . }}
 {{- end -}}
diff --git a/layouts/partials/page_list.html b/layouts/partials/page-list.html
similarity index 100%
rename from layouts/partials/page_list.html
rename to layouts/partials/page-list.html
diff --git a/layouts/partials/page_single.html b/layouts/partials/page-single.html
similarity index 100%
rename from layouts/partials/page_single.html
rename to layouts/partials/page-single.html
diff --git a/layouts/partials/page-variables-deinit.html b/layouts/partials/page-variables-deinit.html
new file mode 100644
index 0000000..61535eb
--- /dev/null
+++ b/layouts/partials/page-variables-deinit.html
@@ -0,0 +1,2 @@
+{{ .Page.Scratch.Delete "fig" }}
+{{ .Page.Scratch.Delete "table" }}
diff --git a/layouts/partials/page-variables-init.html b/layouts/partials/page-variables-init.html
new file mode 100644
index 0000000..6b38b89
--- /dev/null
+++ b/layouts/partials/page-variables-init.html
@@ -0,0 +1,2 @@
+{{ .Page.Scratch.Set "fig" 1 }}
+{{ .Page.Scratch.Set "table" 1 }}
\ No newline at end of file