diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 4250c0e..aac245e 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -7,14 +7,14 @@
{{ block "meta" . }}{{ end }}
-
+
{{ partialCached "scripts.html" . }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 0d2c155..e9031db 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -5,20 +5,15 @@
{{ end }}
{{ define "main" }}
-
-{{ range .Data.Pages }}
-
-
-
-{{ .Summary }}
-
-
+
+{{ $paginator := .Paginate (.Data.Pages) }}
+{{ range $paginator.Pages }}
+{{ .Render "summary"}}
{{ end }}
+
+{{ partial "pagination.html" . }}
{{ partial "menu.html" . }}
-{{ partial "sidebar.html" . }}
-
+{{ if $.Param "sidebar" | default true }}{{ partial "sidebar.html" . }}{{ end }}
{{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 5165d9c..9d016e9 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -2,11 +2,10 @@
{{ define "meta" }}
{{ partial "single_meta.html" . }}
-{{ partial "single_json_ld.html" . }}
{{ end }}
{{ define "main" }}
-
+
{{ .Title }}
{{ partial "menu.html" . }}
-{{ partial "sidebar.html" . }}
+{{ if $.Param "sidebar" | default true }}{{ partial "sidebar.html" . }}{{ end }}
{{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index a667626..29f5d41 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,14 +1,13 @@
{{ define "meta" }}
{{ partial "single_meta.html" . }}
-{{ partial "single_json_ld.html" . }}
{{ end }}
{{ define "main" }}
-
-
+
+
{{ .Content }}
{{ partial "menu.html" . }}
-{{ partial "sidebar.html" . }}
+{{ if $.Param "sidebar" | default true }}{{ partial "sidebar.html" . }}{{ end }}
{{ end }}
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index 4db7c33..0987017 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -2,9 +2,9 @@
{{ .Hugo.Generator }}
-
+
-{{ if and (.Site.RSSLink) (not .Site.Params.supressRSSLink) }}{{ end }}
-{{ with .Site.Params.contact }}{{ end }}
+{{ if and (.Site.RSSLink) (not ($.Param "supressRSSLink")) }}{{ end }}
+{{ with $.Param "contact" }}{{ end }}
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index f27b870..75cdd9b 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -1,3 +1,3 @@
-{{ if .Site.Params.jquery }}{{ end }}
-{{ if and .Site.Params.jquery .Site.Params.slicknav }}{{ end }}
-{{ if .Site.Params.jquery }}{{ end }}
+{{ if $.Param "jquery" }}{{ end }}
+{{ if and ($.Param "jquery") ($.Param "slicknav") }}{{ end }}
+{{ if $.Param "jquery" }}{{ end }}
diff --git a/layouts/partials/search.html b/layouts/partials/search.html
index 04e6837..66a95a8 100644
--- a/layouts/partials/search.html
+++ b/layouts/partials/search.html
@@ -1,6 +1,6 @@
{{ $domain := .Site.BaseURL | replaceRE "^https?://(www\\.)?([^/]+)/?" "$2" }}
diff --git a/layouts/partials/section_meta.html b/layouts/partials/section_meta.html
index 27cc303..f191b5d 100644
--- a/layouts/partials/section_meta.html
+++ b/layouts/partials/section_meta.html
@@ -1 +1 @@
-{{ if and (.RSSLink) (not .Site.Params.supressRSSLink) }}{{ end }}
+{{ if and (.RSSLink) (not ($.Param "supressRSSLink")) }}{{ end }}
diff --git a/layouts/partials/single_json_ld.html b/layouts/partials/single_json_ld.html
deleted file mode 100644
index aa0c5c1..0000000
--- a/layouts/partials/single_json_ld.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
diff --git a/layouts/partials/single_meta.html b/layouts/partials/single_meta.html
index 489e281..c910a3a 100644
--- a/layouts/partials/single_meta.html
+++ b/layouts/partials/single_meta.html
@@ -5,4 +5,4 @@
-{{ with .Params.thumbnail }}{{ end }}
+{{ with $.Param "thumbnail" }}{{ end }}