diff --git a/layouts/partials/footer_scripts.html b/layouts/partials/footer_scripts.html
index a2140c0..0952415 100644
--- a/layouts/partials/footer_scripts.html
+++ b/layouts/partials/footer_scripts.html
@@ -1,18 +1,18 @@
 <!-- Google Analytics -->
-{{ if .Site.Params.GATracker }}
+{{ if .Site.Param "GATracker" }}
 <script type="text/javascript">
 var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
 document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
 </script>
 <script type="text/javascript">
 try {
-    var pageTracker = _gat._getTracker("{{ .Site.Params.GATracker }}");
+    var pageTracker = _gat._getTracker("{{ .Site.Param "GATracker" }}");
     pageTracker._trackPageview();
 } catch(err) {}
 </script>
 {{ end }}
 
-{{ if .Site.Params.HighlightJS }}
+{{ if .Site.Param "HighlightJS" }}
   <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/highlight.min.js"></script>
 
   <script type="text/javascript">
diff --git a/layouts/partials/head_includes.html b/layouts/partials/head_includes.html
index 575f6cb..3063ece 100644
--- a/layouts/partials/head_includes.html
+++ b/layouts/partials/head_includes.html
@@ -10,18 +10,18 @@
 
 <!-- CSS -->
 
-{{ if .Site.Params.HighlightJS }}
+{{ if (.Site.Param "HighlightJS") }}
   <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/styles/default.min.css">
 {{ end }}
 
 
-{{ if eq true .Site.Params.CacheBuster }}
+{{ if eq true (.Site.Param "CacheBuster") }}
 
 <link rel="stylesheet" href="/css/reset.css">
 <link rel="stylesheet" href="/css/pygments.css">
 <link rel="stylesheet" href="/css/main.css">
 
-{{range .Site.Params.ExtraCssFiles}}
+{{range (.Site.Param "ExtraCssFiles")}}
     <link rel="stylesheet" href="{{.}}">
 {{end}}
 
@@ -31,7 +31,7 @@
 <link rel="stylesheet" href="/css/pygments.css?{{ .Now.Unix }}">
 <link rel="stylesheet" href="/css/main.css?{{ .Now.Unix }}">
 
-{{range .Site.Params.ExtraCssFiles}}
+{{range (.Site.Param "ExtraCssFiles")}}
     <link rel="stylesheet" href="{{.}}?{{ .Now.Unix }}">
 {{end}}
 
@@ -39,8 +39,8 @@
 
 <!-- Icon -->
 <link rel="shortcut icon"
-{{ if .Site.Params.FaviconFile }}
-    href="/{{ .Site.Params.FaviconFile }}"
+{{ if (.Site.Param "FaviconFile") }}
+    href="/{{ .Site.Param "FaviconFile" }}"
 {{ else }}
     href="/img/favicon.ico"
 {{ end }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index a645418..c1445c8 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -3,12 +3,12 @@
 
 {{ partial "head.html" . }}
 
-<body lang="{{ .Site.Params.Lang }}">
+<body lang="{{ .Site.Param "Lang" }}">
 
 <section class="header"> 
     <div class="container">
         <div class="content">
-            <a href="/"><div class="name">{{ .Site.Params.Author }}</div></a>
+            <a href="/"><div class="name">{{ .Site.Param "Author" }}</div></a>
             <nav>
                 <ul>
                     <a href="/blog/"><li>Blog</li></a>
@@ -24,38 +24,38 @@
     <div class="container">
         <div class="content">
 
-        {{ if .Site.Params.GitHub }}
-            <a href="{{ .Site.Params.GitHub }}" target="_blank">
+        {{ if .Site.Param "GitHub" }}
+            <a href="{{ .Site.Param "GitHub" }}" target="_blank">
                 <i class="icon ion-social-github"></i>
             </a>
         {{ end }}
         
-        {{ if .Site.Params.Twitter }}
-            <a href="{{ .Site.Params.Twitter }}" target="_blank">
+        {{ if .Site.Param "Twitter" }}
+            <a href="{{ .Site.Param "Twitter" }}" target="_blank">
                 <i class="icon ion-social-twitter"></i>
             </a>
         {{ end }}
 
-        {{ if .Site.Params.LinkedIn }}
-            <a href="{{ .Site.Params.LinkedIn }}" target="_blank">
+        {{ if .Site.Param "LinkedIn" }}
+            <a href="{{ .Site.Param "LinkedIn" }}" target="_blank">
                 <i class="icon ion-social-linkedin"></i>
             </a>
         {{ end }}
 
-        {{ if .Site.Params.Facebook }}
-            <a href="{{ .Site.Params.Facebook }}" target="_blank">
+        {{ if .Site.Param "Facebook" }}
+            <a href="{{ .Site.Param "Facebook" }}" target="_blank">
                 <i class="icon ion-social-facebook larger"></i>
             </a>
         {{ end }}
 
-        {{ if .Site.Params.SoundCloud }}
-            <a href="{{ .Site.Params.SoundCloud }}" target="_blank">
+        {{ if .Site.Param "SoundCloud" }}
+            <a href="{{ .Site.Param "SoundCloud" }}" target="_blank">
                 <i class="icon ion-ios-musical-notes larger"></i>
             </a>
         {{ end }}
 
-        {{ if .Site.Params.Email }}
-            <a href="mailto:{{ .Site.Params.Email }}">
+        {{ if .Site.Param "Email" }}
+            <a href="mailto:{{ .Site.Param "Email" }}">
                 <i class="icon ion-ios-email larger"></i>
             </a>
         {{ end }}
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index ae94ae2..b3eb409 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -3,4 +3,4 @@
 <meta name="HandheldFriendly" content="True">
 <meta name="MobileOptimized" content="320">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ if .Site.Params.Description }}<meta name="description" content="{{ .Site.Params.Description }}">{{ end }}
+{{ if .Site.Param "Description" }}<meta name="description" content="{{ .Site.Param "Description" }}">{{ end }}
