diff --git a/config.toml b/config.toml
index bd13bad..60d6dd9 100644
--- a/config.toml
+++ b/config.toml
@@ -4,7 +4,8 @@ title = "Julien's tech(ish) blog"
 theme = "hugo-kiera"
 canonifyurls = true
 
-paginate = 3
+[pagination]
+pagerSize = 3
 
 summaryLength = 30
 enableEmoji = true
@@ -48,7 +49,7 @@ pygmentsCodeFences = true
     url = "/categories"
     weight = 1
 
-[author]
+[params.author]
     name = "Julien Fiegehenn"
     github = "simbabque"
     #gitlab = "username"
diff --git a/themes/hugo-kiera/layouts/_default/rss.xml b/themes/hugo-kiera/layouts/_default/rss.xml
index 76945ef..fcb8246 100644
--- a/themes/hugo-kiera/layouts/_default/rss.xml
+++ b/themes/hugo-kiera/layouts/_default/rss.xml
@@ -8,9 +8,9 @@
    <link>{{ .Permalink }}</link>
    <description>Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
    <generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
-   <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
-   <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
-   <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
+   <language>{{.}}</language>{{end}}{{ with .Site.Params.Author.email }}
+   <managingEditor>{{.}}{{ with $.Site.Params.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Params.Author.email }}
+   <webMaster>{{.}}{{ with $.Site.Params.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
    <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
    <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
    {{ with .OutputFormats.Get "RSS" }}
@@ -21,7 +21,7 @@
        <title>{{ .Title }}</title>
        <link>{{ .Permalink }}</link>
        <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
-       {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
+       {{ with .Site.Params.Author.email }}<author>{{.}}{{ with $.Site.Params.Author.name }} ({{.}}){{end}}</author>{{end}}
        <guid>{{ .Permalink }}</guid>
        <description>{{ .Content | replaceRE `[\x00-\x1F\x7F]` "" | html}}</description>
      </item>
diff --git a/themes/hugo-kiera/layouts/partials/disqus.html b/themes/hugo-kiera/layouts/partials/disqus.html
index 49f70a6..ccda8ab 100644
--- a/themes/hugo-kiera/layouts/partials/disqus.html
+++ b/themes/hugo-kiera/layouts/partials/disqus.html
@@ -12,7 +12,7 @@
                   return;
 
             var disqus_loaded = false;
-            var disqus_shortname = '{{ .Site.DisqusShortname }}';
+            var disqus_shortname = '{{ .Site.Config.Services.Disqus.Shortname }}';
             var disqus_button = document.getElementById("show-comments");
 
             var disqus_autoload = {{ .Site.Params.commentAutoload }};
diff --git a/themes/hugo-kiera/layouts/partials/footer.html b/themes/hugo-kiera/layouts/partials/footer.html
index 8701f55..5d0c490 100644
--- a/themes/hugo-kiera/layouts/partials/footer.html
+++ b/themes/hugo-kiera/layouts/partials/footer.html
@@ -18,7 +18,7 @@ <h6><a class="{{if or ($currentPage.IsMenuCurrent "footer" .) ($currentPage.HasM
     </footer>
 </div>
 <script src="{{ "js/scripts.js" | relURL }}"></script>
-{{ if .Site.GoogleAnalytics }}
+{{ if .Site.Config.Services.GoogleAnalytics.ID }}
   {{ template "_internal/google_analytics.html" . }}
 {{ end }}
 <script src="https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.min.js"></script>
diff --git a/themes/hugo-kiera/layouts/partials/header.html b/themes/hugo-kiera/layouts/partials/header.html
index 8008635..94f9e65 100644
--- a/themes/hugo-kiera/layouts/partials/header.html
+++ b/themes/hugo-kiera/layouts/partials/header.html
@@ -40,9 +40,9 @@ <h1>
           {{ end }}
         {{- end -}}
         {{- range .Site.Data.social.social_icons -}}
-          {{- if isset $.Site.Author .id }}
+          {{- if isset $.Site.Params.Author .id }}
              <li>
-               <a href="{{ printf .url (index $.Site.Author .id) }}" title="{{ .title }}">
+               <a href="{{ printf .url (index $.Site.Params.Author .id) }}" title="{{ .title }}">
                <i class="{{ .icon }} fa-lg"></i>
                </a>
              </li>
diff --git a/themes/hugo-kiera/layouts/partials/meta.html b/themes/hugo-kiera/layouts/partials/meta.html
index 3ec0e77..b5e3dff 100644
--- a/themes/hugo-kiera/layouts/partials/meta.html
+++ b/themes/hugo-kiera/layouts/partials/meta.html
@@ -1,7 +1,7 @@
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <meta name="description" content="{{ .Site.Params.description | default "The HTML5 Herald" }}" />
-<meta name="author" content="{{ .Params.Author | default .Site.Author.name }}" />
+<meta name="author" content="{{ .Params.Author | default .Site.Params.Author.name }}" />
 {{- with .OutputFormats.Get "rss" -}}
 	{{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
 {{- end -}}
diff --git a/themes/hugo-kiera/layouts/partials/single_footer.html b/themes/hugo-kiera/layouts/partials/single_footer.html
index 000dbd8..a582aba 100644
--- a/themes/hugo-kiera/layouts/partials/single_footer.html
+++ b/themes/hugo-kiera/layouts/partials/single_footer.html
@@ -17,7 +17,7 @@
     {{ if .Site.Params.UtterancesRepo }}
         {{ partial "utterances" . }}
     {{ end }}
-    {{ if .Site.DisqusShortname }}
+    {{ if .Site.Config.Services.Disqus.Shortname }}
         {{ partial "disqus" . }}
     {{ end }}
   {{ end }}