diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 134d50d..56f11a9 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -16,10 +16,10 @@
     <title>{{ if eq  .Title  site.Title }}{{ site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ site.Title }}{{ end }}</title>
     <link>{{ .Permalink }}</link>
     <description>Recent content {{ if ne  .Title  site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ site.Title }}</description>
-    {{- with site.Params.images }}
+    {{- with site.Params.logo }}
     <image>
-      <url>{{ index . 0 | absURL }}</url>
-      <link>{{ index . 0 | absURL }}</link>
+      <url>{{ .icon | absURL }}</url>
+      <link>{{ .icon | absURL }}</link>
     </image>
     {{- end }}
     <generator>Hugo -- gohugo.io</generator>{{ with site.LanguageCode }}
@@ -40,7 +40,7 @@
       {{ with site.Author.email }}<author>{{.}}{{ with site.Author.name }} ({{.}}){{end}}</author>{{end}}
       <guid>{{ .Permalink }}</guid>
       <description>{{ with .Description | html }}{{ . }}{{ else }}{{ .Summary | html }}{{ end -}}</description>
-      {{- if site.Params.ShowFullTextinRSS }}
+      {{- if not site.Params.RSSNoContent}}
       <content:encoded>{{ (printf "<![CDATA[%s]]>" .Content) | safeHTML }}</content:encoded>
       {{- end }}
     </item>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 43ef99e..36775ce 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -60,7 +60,7 @@
 {{- end }}
 
 {{- /* Favicons */}}
-<link rel="icon" href="{{ site.Params.assets.favicon | default "favicon.ico" | absURL }}">
+<link rel="icon" href="{{ site.Params.favicon | default "favicon.ico" | absURL }}">
 
 {{- /* RSS */}}
 {{ range .AlternativeOutputFormats -}}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 004f7c6..f708cb7 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -42,11 +42,11 @@
 <header class="header">
     <nav class="nav">
         <div class="logo">
-            {{- $label_text := (site.Params.label.text | default site.Title) }}
+            {{- $label_text := (site.Params.logo.text | default site.Title) }}
             {{- if site.Title }}
             <a href="{{ "" | absURL }}" accesskey="h" title="{{ $label_text }} (Alt + H)">
-                {{- if site.Params.label.icon }}
-                {{- $img := resources.Get site.Params.label.icon }}
+                {{- if site.Params.logo.icon }}
+                {{- $img := resources.Get site.Params.logo.icon }}
                 {{- if $img }}
                     {{- $processableFormats := (slice "jpg" "jpeg" "png" "tif" "bmp" "gif") -}}
                     {{- if hugo.IsExtended -}}
@@ -54,17 +54,17 @@
                     {{- end -}}
                     {{- $prod := (hugo.IsProduction | or (eq site.Params.env "production")) }}
                     {{- if and (in $processableFormats $img.MediaType.SubType) (eq $prod true)}}
-                        {{- if site.Params.label.iconHeight }}
-                            {{- $img = $img.Resize (printf "x%d" site.Params.label.iconHeight) }}
+                        {{- if site.Params.logo.iconHeight }}
+                            {{- $img = $img.Resize (printf "x%d" site.Params.logo.iconHeight) }}
                         {{ else }}
                             {{- $img = $img.Resize "x30" }}
                         {{- end }}
                     {{- end }}
                     <img src="{{ $img.Permalink }}" alt="logo" aria-label="logo"
-                        height="{{- site.Params.label.iconHeight | default "30" -}}">
+                        height="{{- site.Params.logo.iconHeight | default "30" -}}">
                 {{- else }}
-                <img src="{{- site.Params.label.icon | absURL -}}" alt="logo" aria-label="logo"
-                    height="{{- site.Params.label.iconHeight | default "30" -}}">
+                <img src="{{- site.Params.logo.icon | absURL -}}" alt="logo" aria-label="logo"
+                    height="{{- site.Params.logo.iconHeight | default "30" -}}">
                 {{- end -}}
                 {{- end -}}
                 {{- $label_text -}}
diff --git a/layouts/partials/templates/schema_json.html b/layouts/partials/templates/schema_json.html
index 8831609..27f2452 100644
--- a/layouts/partials/templates/schema_json.html
+++ b/layouts/partials/templates/schema_json.html
@@ -7,7 +7,7 @@
   "name": {{ site.Title }},
   "url": {{ site.BaseURL }},
   "description": {{ site.Params.description | plainify | truncate 180 | safeHTML }},
-  "thumbnailUrl": {{ site.Params.assets.favicon | default "favicon.ico" | absURL }},
+  "thumbnailUrl": {{ site.Params.favicon | default "favicon.ico" | absURL }},
   "sameAs": [
     {{- if site.Params.schema.sameAs }}
       {{ range $i, $e := site.Params.schema.sameAs }}{{ if $i }}, {{ end }}{{ trim $e " " }}{{ end }}
@@ -109,7 +109,7 @@
     "name": {{ site.Title }},
     "logo": {
       "@type": "ImageObject",
-      "url": {{ site.Params.assets.favicon | default "favicon.ico" | absURL }}
+      "url": {{ site.Params.favicon | default "favicon.ico" | absURL }}
     }
   }
 }