Uniformise config key case

Use camelCase over snake_case to be more consistant with Hugo Style and fontmatter

closes #25

13 files changed, 159 insertions, 90 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afa100f..8253b7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,76 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.2.0-ALPHA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/2) - TBD
+
+### Breaking changes
+
+Replace
+
+```toml
+[author]
+    gravatar_email = "your@email.com"
+    google_plus = "+YourGooglePlus"
+```
+
+to
+
+```toml
+[author]
+    gravatarEmail = "your@email.com"
+    googlePlus = "+YourGooglePlus"
+```
+
+Replace
+
+```toml
+[params]
+    clear_reading = ...
+    hierarchical_categories = ...
+    sidebar_behavior = ...
+    cover_image = ...
+    image_gallery = ...
+    thumbnail_image = ...
+    thumbnail_image_position = ...
+    auto_thumbnail_image = ...
+    fb_admin_ids = ...
+    fb_app_id = ...
+    category_pagination = ...
+    archive_pagination = ...
+    tag_pagination = ...
+```
+
+to
+
+```toml
+[params]
+    clearReading = ...
+    hierarchicalCategories = ...
+    sidebarBehavior = ...
+    coverImage = ...
+    imageGallery = ...
+    thumbnailImage = ...
+    thumbnailImagePosition = ...
+    autoThumbnailImage = ...
+    fbAdminIds = ...
+    fbAppId = ...
+    categoryPagination = ...
+    archivePagination = ...
+    tagPagination = ...
+```
+
+Replace
+
+```
+[params.header.right_link]
+```
+
+to
+
+```
+[params.header.rightLink]
+```
+
 ## [0.1.4-ALPHA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/9) - 16 nov 2016
 
 - Remove migration scripts ([#45](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/45))
@@ -15,7 +85,7 @@ All notable changes to this project will be documented in this file.
 - Fix *archives* pages generation by creating `archive` taxonomy ([#31](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/31))
 - Use `slug` instead of `title` for *permalink* urls ([#33](https://github.com/kakawait/hugo-tranquilpeak-theme/pull/33))
 
-### Migration
+### Breaking changes
 
 - [archive page return 404](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/31)
 
@@ -23,7 +93,7 @@ Add
 
 ```toml
 [taxonomies]
-	archive = "archives"
+    archive = "archives"
 ```
 
 ## [0.1.1-ALPHA](https://github.com/kakawait/hugo-tranquilpeak-theme/milestone/6) - 13 nov 2016
@@ -32,7 +102,7 @@ Add
 - **[Breaking changes]** Changes *Google Analytics* config key from `params.google_analytics_id` to official `googleAnalytics` ([#21](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/21))
 - Add parameter to choose between sync/async loading of *Google Analytics* `params.ga.async` ([#21](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/21))
 
-### Migration
+### Breaking changes
 
 - [Migrate google analytics](https://github.com/kakawait/hugo-tranquilpeak-theme/issues/21)
 
@@ -40,7 +110,7 @@ Replace
 
 ```toml
 [params]
-	google_analytics_id = "UA-XXX-X"
+    google_analytics_id = "UA-XXX-X"
 ```
 
 to (top level)
diff --git a/README.md b/README.md
index 7467951..b504d31 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ Please all the credit should be attributed to [original *Hexo* version](https://
 - [ ] Duoshuo
 - [ ] Baidu analytics
 - [ ] Algolia (https://github.com/kakawait/hugo-tranquilpeak-theme/issues/8)
-- [ ] Pagination custumization `tag_pagination`, `category_pagination` and `archive_pagination` (https://github.com/kakawait/hugo-tranquilpeak-theme/issues/17)
+- [ ] Pagination custumization `tagPagination`, `categoryPagination` and `archivePagination` (https://github.com/kakawait/hugo-tranquilpeak-theme/issues/17)
 
 **ATTENTION** following features will not be possible due to *Hugo* limitations
 
diff --git a/docs/user.md b/docs/user.md
index 70a575a..de3fe4b 100644
--- a/docs/user.md
+++ b/docs/user.md
@@ -93,7 +93,7 @@ If you want to report a bug or ask a question, [create an issue](https://github.
 - [ ] Duoshuo
 - [ ] Baidu analytics
 - [ ] Algolia (https://github.com/kakawait/hugo-tranquilpeak-theme/issues/8)
-- [ ] Pagination custumization `tag_pagination`, `category_pagination` and `archive_pagination` (https://github.com/kakawait/hugo-tranquilpeak-theme/issues/17)
+- [ ] Pagination custumization `tagPagination`, `categoryPagination` and `archivePagination` (https://github.com/kakawait/hugo-tranquilpeak-theme/issues/17)
 
 **ATTENTION** following features will not be possible due to *Hugo* limitations
 
@@ -290,7 +290,7 @@ The right link of the header is customizable. You can add a link (as an icon) at
 E.g to display a shortcut to open algolia search window :
 
 ```toml
-[params.header.right_link]
+[params.header.rightLink]
   class = "open-algolia-search"
   icon = "search"
   url = "/#search"
@@ -311,26 +311,26 @@ E.g to display a shortcut to open algolia search window :
   job = "Java backend developer"
   location = "France"
   # Your Gravatar email. Overwrite `author.picture` everywhere in the blog
-  gravatar_email = "thibaud.lepretre@gmail.com"
+  gravatarEmail = "thibaud.lepretre@gmail.com"
   # Your profile picture
-  # Overwritten by your gravatar image if `author.gravatar` is filled
+  # Overwritten by your gravatar image if `author.gravatarEmail` is filled
   picture = "https://cdn1.iconfinder.com/data/icons/ninja-things-1/1772/ninja-simple-512.png"
   # Your Twitter username without the @. E.g : tranquilpeak
   twitter = "thibaudlepretre"
   # Your google plus profile id. E.g : +ThibaudLepretre or 114625208755123718311
-  google_plus = "+ThibaudLepretre"
+  googlePlus = "+ThibaudLepretre"
 ```
   
-| Variable       | Description                                                                          |
-|----------------|--------------------------------------------------------------------------------------|
-| name           | Your name                                                                            |
-| gravatar_email | This address will be used to get your gravatar image if you activate gravatar option |
-| bio            | Your biography (Markdown and HTML supported)                                         |
-| job            | Your job                                                                             |
-| location       | Your location                                                                        |
-| picture        | Your profile picture. Overwritten by your gravatar image if gravatar email is filled |
-| twitter        | Your Twitter username without the @. E.g : `thibaudlepretre`                         |
-| google_plus    | Your google plus profile id. E.g : `+ThibaudLepretre` or `114625208755123718311`     |
+| Variable        | Description                                                                          |
+|-----------------|--------------------------------------------------------------------------------------|
+| name            | Your name                                                                            |
+| gravatarEmail   | This address will be used to get your gravatar image if you activate gravatar option |
+| bio             | Your biography (Markdown and HTML supported)                                         |
+| job             | Your job                                                                             |
+| location        | Your location                                                                        |
+| picture         | Your profile picture. Overwritten by your gravatar image if gravatar email is filled |
+| twitter         | Your Twitter username without the @. E.g : `thibaudlepretre`                         |
+| googlePlus      | Your google plus profile id. E.g : `+ThibaudLepretre` or `114625208755123718311`     |
 
 #### Customization
 
@@ -338,37 +338,34 @@ E.g to display a shortcut to open algolia search window :
 
 ```toml
 [params]
-  sidebar_behavior = 1
-  thumbnail_image = true
-  thumbnail_image_position = "right"
-  auto_thumbnail_image = true
-  cover_image = "cover.jpg"
+  sidebarBehavior = 1
+  thumbnailImage = true
+  thumbnailImagePosition = "right"
+  autoThumbnailImage = true
+  coverImage = "cover.jpg"
   favicon =
-  image_gallery = true
-  archive_pagination = true
-  category_pagination = true
-  tag_pagination = true
-  hierarchical_categories = true
+  imageGallery = true
+  hierarchicalCategories = true
 ```
 
 | Variable | Description |
 |--------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| sidebar_behavior | Define the behavior of the header and sidebar :<ul><li>1: Display extra large sidebar on extra large screen, large sidebar on large screen, medium sidebar on medium screen and header bar on small screen and extra large sidebar is swiped on extra large screen and large sidebar on all lower screens when open button is clicked (default)</li><li>2: Display large sidebar on extra large & large screen, medium sidebar on medium screen and header bar on small screen and large sidebar is swiped when open button is clicked</li><li>3: Display medium sidebar on large and medium screen and header bar on small screen and medium sidebar is swiped when open button is clicked</li><li>4: Display header bar on all screens, extra large sidebar is swiped on extra large screen and large sidebar is swiped on all lower screens</li><li>5: Display header bar on all screens and large sidebar is swiped on large screen</li><li>6: isplay header bar on all screens and medium sidebar is swiped</li></ul> |
-| clear_reading | Hide sidebar on all article page to let article take full width to improve reading, and enjoy wide images and cover images. Useless if `sidebar_behavior` is equal to `3` or `4`. (true: enable, false: disable). Default behavior : `theme.clear_reading` value in theme configuration file. |
-| thumbnail_image | Display thumbnail image of each post on index pages |
-| thumbnail_image_position | Display thumbnail image at the right of title in index pages (`right`, `left` or `bottom`). Set this value to `right` if you have old posts to keep the old style on them and define `thumbnailImagePosition` on a post to overwrite this setting. (Default : `right`) |
-| auto_thumbnail_image | Automatically select the cover image or the first photo from the gallery of a post if there is no thumbnail image as the thumbnail image. Set this value to `true` if you have old posts that use the cover image or the first photo as the thumbnail image and set `autoThumbnailImage` to `false` on a post to overwrite this setting. (Default : `true`) |
-| cover_image | Your blog cover picture. **I STRONGLY recommend you to use a CDN to speed up loading of pages. There is many free CDN like Cloudinary or you can also use indirectly by using services like Google Photos.** |
+| sidebarBehavior | Define the behavior of the header and sidebar :<ul><li>1: Display extra large sidebar on extra large screen, large sidebar on large screen, medium sidebar on medium screen and header bar on small screen and extra large sidebar is swiped on extra large screen and large sidebar on all lower screens when open button is clicked (default)</li><li>2: Display large sidebar on extra large & large screen, medium sidebar on medium screen and header bar on small screen and large sidebar is swiped when open button is clicked</li><li>3: Display medium sidebar on large and medium screen and header bar on small screen and medium sidebar is swiped when open button is clicked</li><li>4: Display header bar on all screens, extra large sidebar is swiped on extra large screen and large sidebar is swiped on all lower screens</li><li>5: Display header bar on all screens and large sidebar is swiped on large screen</li><li>6: isplay header bar on all screens and medium sidebar is swiped</li></ul> |
+| clearReading | Hide sidebar on all article page to let article take full width to improve reading, and enjoy wide images and cover images. Useless if `sidebarBehavior` is equal to `3` or `4`. (true: enable, false: disable). Default behavior : `params.clearReading` value in theme configuration file. |
+| thumbnailImage | Display thumbnail image of each post on index pages |
+| thumbnailImagePosition | Display thumbnail image at the right of title in index pages (`right`, `left` or `bottom`). Set this value to `right` if you have old posts to keep the old style on them and define `thumbnailImagePosition` on a post to overwrite this setting. (Default : `right`) |
+| autoThumbnailImage | Automatically select the cover image or the first photo from the gallery of a post if there is no thumbnail image as the thumbnail image. Set this value to `true` if you have old posts that use the cover image or the first photo as the thumbnail image and set `autoThumbnailImage` to `false` on a post to overwrite this setting. (Default : `true`) |
+| coverImage | Your blog cover picture. **I STRONGLY recommend you to use a CDN to speed up loading of pages. There is many free CDN like Cloudinary or you can also use indirectly by using services like Google Photos.** |
 | favicon | Your favicon path |
-| image_gallery | Display an image gallery at the end of a post which have `photos` variables. (false: disabled, true: enabled) |
-| hierarchical_categories | Define categories will create hierarchy between parents: `categories = ["foo", "bar"]` will consider "bar" a sub-category of "foo". If false it will flat categories. |
+| imageGallery | Display an image gallery at the end of a post which have `photos` variables. (false: disabled, true: enabled) |
+| hierarchicalCategories | Define categories will create hierarchy between parents: `categories = ["foo", "bar"]` will consider "bar" a sub-category of "foo". If false it will flat categories. |
 
 E.g :  
-A category page look like this with `hierarchical_categories = true` :  
-![hierarchical_categories true](img/with_hierarchical_categories.png)  
+A category page look like this with `hierarchicalCategories = true` :  
+![hierarchicalCategories true](img/with_hierarchical_categories.png)  
 
-The same page with `hierarchical_categories = false`:  
-![hierarchical_categories false](img/without_hierarchical_categories.png)  
+The same page with `hierarchicalCategories = false`:  
+![hierarchicalCategories false](img/without_hierarchical_categories.png)  
 
 #### Integrated services
 
@@ -379,22 +376,22 @@ googleAnalytics =
 
 ```toml
 [author]
-  gravatar_email =
+  gravatarEmail =
 ```
 
 ```toml
 [params]
-  fb_admin_ids = 
-  fb_app_id = 
+  fbAdminIds = 
+  fbAppId = 
 ```
 
 | Variable | Description |
 |---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | disqusShortname | Your Disqus shortname. |
-| gravatar_email | Your gravatar email. Overwrite `author.picture` everywhere in the blog |
+| gravatarEmail | Your gravatar email. Overwrite `author.picture` everywhere in the blog |
 | googleAnalytics | Your Google analystics web property ID : UA-XXXXX-X |
-| fb_admin_ids | Your Facebook user ids used to connect your blog with your facebook user accounts (Facebook Insights). Separate ids with comma. E.g : `9830047,1003342`. Visit [Facebook docs](https://developers.facebook.com/docs/platforminsights/domains) for more information. |
-| fb_app_id | Your Facebook app id used to connect your blog with your facebook app account (Facebook Insights). E.g : `9841307`. Visit [Facebook docs](https://developers.facebook.com/docs/platforminsights/domains) for more information. |
+| fbAdminIds | Your Facebook user ids used to connect your blog with your facebook user accounts (Facebook Insights). Use array syntax. E.g : `[9830047, 1003342]`. Visit [Facebook docs](https://developers.facebook.com/docs/platforminsights/domains) for more information. |
+| fbAppId | Your Facebook app id used to connect your blog with your facebook app account (Facebook Insights). E.g : `9841307`. Visit [Facebook docs](https://developers.facebook.com/docs/platforminsights/domains) for more information. |
 
 ### Enable pages ###
 
@@ -488,10 +485,10 @@ comments: false
 |---|---|
 |disqusIdentifier|Define a unique string which is used to look up a page's thread in the Disqus system.|
 |keywords|Define keywords for search engines. you can also define global keywords in Hugo configuration file.|
-|clearReading|Hide sidebar on all article page to let article take full width to improve reading, and enjoy wide images and cover images. Useless if `theme.sidebar_behavior` is equal to `3` or `4`. (true: enable, false: disable). Default behavior : `theme.clear_reading` value in theme configuration file.|
-|autoThumbnailImage|Automatically select the cover image or the first photo from the gallery of a post if there is no thumbnail image as the thumbnail image. `autoThumbnailImage` overwrite the setting `auto_thumbnail_image` in the theme configuration file|
+|clearReading|Hide sidebar on all article page to let article take full width to improve reading, and enjoy wide images and cover images. Useless if `params.sidebarBehavior` is equal to `3` or `4`. (true: enable, false: disable). Default behavior : `params.clearReading` value in theme configuration file.|
+|autoThumbnailImage|Automatically select the cover image or the first photo from the gallery of a post if there is no thumbnail image as the thumbnail image. `autoThumbnailImage` overwrite the setting `autoThumbnailImage` in the theme configuration file|
 |thumbnailImage|Image displayed in index view.|
-|thumbnailImagePosition|Display thumbnail image at the right of title in index pages (`right`, `left` or `bottom`). `thumbnailImagePosition` overwrite the setting `thumbnail_image_position` in the theme configuration file|
+|thumbnailImagePosition|Display thumbnail image at the right of title in index pages (`right`, `left` or `bottom`). `thumbnailImagePosition` overwrite the setting `thumbnailImagePosition` in the theme configuration file|
 |metaAlignment|Meta (title, date and categories) alignment (right, left or center). Default behavior : left|
 |coverImage|Image displayed in full size at the top of your post in post view. If thumbnail image is not configured, cover image is also used as thumbnail image. Check the beautiful demo here : [Cover image demo](https://tranquilpeak.kakawait.com/2015/05/cover-image-showcase/)|
 |coverSize|`partial`: cover image take a part of the screen height (60%), `full`: cover image take the entire screen height.|
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index c118f84..8a07ac0 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -16,9 +16,9 @@ baseurl = ""
 languageCode = "en-us"
 title = "Hugo tranquilpeak theme"
 theme = "hugo-tranquilpeak-theme"
-DisqusShortname = "hugo-tranquilpeak-theme"
+disqusShortname = "hugo-tranquilpeak-theme"
 # googleAnalytics = "UA-123-45"
-Paginate = 7
+paginate = 7
 canonifyurls = true
 defaultContentLanguage = "en-us"
 
@@ -36,14 +36,14 @@ defaultContentLanguage = "en-us"
   job = "Your job title"
   location = "France"
   # Your Gravatar email. Overwrite `author.picture` everywhere in the blog
-  gravatar_email = "thibaud.lepretre@gmail.com"
+  gravatarEmail = "thibaud.lepretre@gmail.com"
   # Your profile picture
-  # Overwritten by your gravatar image if `author.gravatar` is filled
+  # Overwritten by your gravatar image if `author.gravatarEmail` is filled
   picture = "https://cdn1.iconfinder.com/data/icons/ninja-things-1/1772/ninja-simple-512.png"
   # Your Twitter username without the @. E.g : thibaudlepretre
   # twitter = "thibaudlepretre"
   # Your google plus profile id. E.g : +ThibaudLepretre or 114625208755123718311
-  # google_plus = "+ThibaudLepretre"
+  # googlePlus = "+ThibaudLepretre"
 
 # Menu Configuration
 [[menu.main]]
@@ -106,11 +106,13 @@ defaultContentLanguage = "en-us"
 
   # Global keywords configuration. Following keywords will be add to every pages
   # keywords = ["development", "next-gen"]
-  
+
   # Hide sidebar on all article page to let article take full width to improve reading, and enjoy wide images and cover images. (true: enable, false: disable)
-  clear_reading = true
+  clearReading = true
 
-  hierarchical_categories = true
+  # Define categories will create hierarchy between parents: `categories = ["foo", "bar"]` will consider "bar" a sub-category of "foo". 
+  # If false it will flat categories.
+  hierarchicalCategories = true
 
   description = "Hugo tranquilpeak theme demo"
 
@@ -127,7 +129,7 @@ defaultContentLanguage = "en-us"
   #    large sidebar is swiped on all lower screens
   # 5: Display header bar on all screens and large sidebar is swiped on large screen
   # 6: Display header bar on all screens and medium sidebar is swiped
-  sidebar_behavior = 1
+  sidebarBehavior = 1
 
   # Your blog cover picture. I STRONGLY recommend you to use a CDN to speed up loading of pages.
   # There is many free CDN like Cloudinary or you can also use indirectly
@@ -135,21 +137,21 @@ defaultContentLanguage = "en-us"
   # Current image is on AWS S3 and delivered by AWS CloudFront.
   # Otherwise put your image in folder `static/_images/` (development)  or in `source/assets/images/` if you can't or don't want to build the theme,
   # and use relative url : `your-image.png`
-  cover_image = "cover.jpg"
+  coverImage = "cover.jpg"
 
   # Display an image gallery at the end of a post which have photos variables (false: disabled, true: enabled)
-  image_gallery = true
+  imageGallery = true
 
   # Display thumbnail image of each post on index pages (false: disabled, true: enabled)
-  thumbnail_image = true
+  thumbnailImage = true
   # Display thumbnail image at the right of title in index pages (`right`, `left` or `bottom`)
   # Set this value to `right` if you have old posts to keep the old style on them
   # and define `thumbnailImagePosition` on a post to overwrite this setting
-  thumbnail_image_position = "bottom"
+  thumbnailImagePosition = "bottom"
   # Automatically select the cover image or the first photo from the gallery of a post if there is no thumbnail image as the thumbnail image
   # Set this value to `true` if you have old posts that use the cover image or the first photo as the thumbnail image
   # and set `autoThumbnailImage` to `false` on a post to overwrite this setting
-  auto_thumbnail_image = true
+  autoThumbnailImage = true
 
   # Header configuration
   # The link at the right of the header is customizable
@@ -158,7 +160,7 @@ defaultContentLanguage = "en-us"
   #     url: /#search
   #     icon: search
   #     class: st-search-show-outputs
-  [params.header.right_link]
+  [params.header.rightLink]
     class = ""
     icon = ""
     url = "/#about"
diff --git a/exampleSite/content/post/Welcome-to-the-new-Tranquilpeak.md b/exampleSite/content/post/Welcome-to-the-new-Tranquilpeak.md
index 666503d..d34509c 100644
--- a/exampleSite/content/post/Welcome-to-the-new-Tranquilpeak.md
+++ b/exampleSite/content/post/Welcome-to-the-new-Tranquilpeak.md
@@ -107,7 +107,7 @@ Please all the credit should be attributed to [original *Hexo* version](https://
 - [ ] Duoshuo
 - [ ] Baidu analytics
 - [ ] Algolia (https://github.com/kakawait/hugo-tranquilpeak-theme/issues/8)
-- [ ] Pagination custumization `tag_pagination`, `category_pagination` and `archive_pagination` (https://github.com/kakawait/hugo-tranquilpeak-theme/issues/17)
+- [ ] Pagination custumization `tagPagination`, `categoryPagination` and `archivePagination` (https://github.com/kakawait/hugo-tranquilpeak-theme/issues/17)
 
 **ATTENTION** following features will not be possible due to *Hugo* limitations
 
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 4690ed4..d450549 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -1,8 +1,8 @@
-{{ if .Site.Params.thumbnail_image }}
+{{ if .Site.Params.thumbnailImage }}
   {{ if .Params.thumbnailimage }}
     {{ .Scratch.Set "thumbnailImage" (.Params.thumbnailimage | absURL) }}
   {{ else }}
-    {{ if or .Params.autothumbnailimage (and .Site.Params.auto_thumbnail_image (ne .Params.autothumbnailimage false)) }}
+    {{ if or .Params.autothumbnailimage (and .Site.Params.autoThumbnailImage (ne .Params.autothumbnailimage false)) }}
       {{ if .Params.gallery }}
         {{ range first 1 .Params.gallery }}
           {{ range first 1 (split . " ") }}
diff --git a/layouts/partials/cover.html b/layouts/partials/cover.html
index 820b850..f655a79 100644
--- a/layouts/partials/cover.html
+++ b/layouts/partials/cover.html
@@ -1,4 +1,4 @@
-{{ with .Site.Params.cover_image }}
+{{ with .Site.Params.coverImage }}
   {{ if (in . "://") }}
     {{ $cover := . }}
     <div id="cover" style="background-image:url('{{ $cover | absURL }}');"></div>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index a7e8a19..843bc12 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -4,13 +4,13 @@
     {{ $.Scratch.Set "isPost" true }}
   {{ end }}
 {{ end }}
-{{ if and (and ($.Scratch.Get "isPost") (lt .Site.Params.sidebar_behavior 3)) (or (and .Site.Params.clear_reading (not .Params.clearReading)) .Params.clearReading) }}
-  {{ .Scratch.Set "sidebarBehavior" (add .Site.Params.sidebar_behavior 3) }}
+{{ if and (and ($.Scratch.Get "isPost") (lt .Site.Params.sidebarBehavior 3)) (or (and .Site.Params.clearReading (not .Params.clearReading)) .Params.clearReading) }}
+  {{ .Scratch.Set "sidebarBehavior" (add .Site.Params.sidebarBehavior 3) }}
 {{ else }}
-  {{ .Scratch.Set "sidebarBehavior" .Site.Params.sidebar_behavior }}
+  {{ .Scratch.Set "sidebarBehavior" .Site.Params.sidebarBehavior }}
 {{ end }}
-{{ if .Site.Author.gravatar_email }}
-  {{ .Scratch.Set "authorPicture" (printf "//www.gravatar.com/avatar/%s" (urlize (md5 .Site.Author.gravatar_email))) }}
+{{ if .Site.Author.gravatarEmail }}
+  {{ .Scratch.Set "authorPicture" (printf "//www.gravatar.com/avatar/%s" (urlize (md5 .Site.Author.gravatarEmail))) }}
 {{ else if .Site.Author.picture }}
   {{ .Scratch.Set "authorPicture" (absURL .Site.Author.picture) }}
 {{ end }}
@@ -42,19 +42,19 @@
     {{ with .Site.Author.twitter }}
       <meta name="twitter:creator" content="@{{ . }}">
     {{ end }}
-    {{ with .Site.Params.fb_app_id }}
+    {{ with .Site.Params.fbAppId }}
       <meta property="fb:app_id" content="{{ . }}">
     {{ end }}
 
     <!-- Facebook admins -->
-    {{ with .Site.Params.fb_admin_ids }}
+    {{ with .Site.Params.fbAdminIds }}
       {{ range . }}
           <meta property="fb:admins" content="{{ . }}">
       {{ end }}
     {{ end }}
 
-    {{ if .Site.Author.gravatar_email }}
-      <meta property="og:image" content="//www.gravatar.com/avatar/{{ (md5 .Site.Author.gravatar_email) | urlize }}?s=640">
+    {{ if .Site.Author.gravatarEmail }}
+      <meta property="og:image" content="//www.gravatar.com/avatar/{{ (md5 .Site.Author.gravatarEmail) | urlize }}?s=640">
     {{ else if .Site.Author.picture }}
       <meta property="og:image" content="{{ .Site.Author.picture | absURL }}">
     {{ end }}
@@ -71,7 +71,7 @@
       {{ end }}
     {{ end }}
 
-    {{ with .Site.Author.google_plus }}
+    {{ with .Site.Author.googlePlus }}
       <link rel="publisher" href="https://plus.google.com/{{ . | urlize }}">
     {{ end }}
 
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index d9fc55c..e8e7382 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -3,7 +3,7 @@
   <div class="header-title">
     <a class="header-title-link" href="{{ "/" | relURL }}">{{ .Site.Title }}</a>
   </div>
-  {{ with .Site.Params.header.right_link }}
+  {{ with .Site.Params.header.rightLink }}
     {{ if and (in .url ":") (not (in .url (printf "%s" $.Site.BaseURL))) }}
       <a class="{{ if .icon }}header-right-icon {{ else }}header-right-picture {{ end }}{{ with .class }}{{ . }}{{ end }}"
          href="{{ .url | safeURL }}" target="_blank">
@@ -14,7 +14,7 @@
     {{ if .icon }}
       <i class="fa fa-lg fa-{{ .icon }}"></i>
     {{ end }}
-    {{ if not $.Site.Params.header.right_link.icon }}
+    {{ if not $.Site.Params.header.rightLink.icon }}
       {{ with ($.Scratch.Get "authorPicture") }}
         <img class="header-picture" src="{{ . }}{{ if in . "//www.gravatar.com/avatar/" }}?s=90{{ end }}" alt="{{ i18n "global.author_picture" }}" />
       {{ end }}
diff --git a/layouts/partials/post/gallery.html b/layouts/partials/post/gallery.html
index 27d97c9..5447d46 100644
--- a/layouts/partials/post/gallery.html
+++ b/layouts/partials/post/gallery.html
@@ -1,4 +1,4 @@
-{{ if and .Site.Params.image_gallery .Params.gallery }}
+{{ if and .Site.Params.imageGallery .Params.gallery }}
   {{ $galleryLength := len .Params.gallery }}
   {{ $imageGalleryClass := "" }}
   {{ if gt $galleryLength 0 }}
diff --git a/layouts/taxonomy/category.html b/layouts/taxonomy/category.html
index b176b72..96381d3 100644
--- a/layouts/taxonomy/category.html
+++ b/layouts/taxonomy/category.html
@@ -3,14 +3,14 @@
     <div id="blog">
       {{ partial "header.html" . }}
       {{ partial "sidebar.html" . }}
-      {{ if or (not (isset .Site.Params "category_pagination")) (.Site.Params.category_pagination) }}
+      {{ if or (not (isset .Site.Params "categoryPagination")) (.Site.Params.categoryPagination) }}
         {{ partial "post/header-cover.html" . }}
       {{ end }}
       <div id="main" data-behavior="{{ .Scratch.Get "sidebarBehavior" }}"
         class="{{ with .Params.coverimage }}hasCover{{ end }}
                {{ if eq .Params.covermeta "out" }}hasCoverMetaOut{{ else }}hasCoverMetaIn{{ end }}
                {{ with .Params.coverCaption }}hasCoverCaption{{ end }}">
-        {{ if or (not (isset .Site.Params "category_pagination")) (.Site.Params.category_pagination) }}
+        {{ if or (not (isset .Site.Params "categoryPagination")) (.Site.Params.categoryPagination) }}
           <section class="postShorten-group main-content-wrap">
             {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}
             {{ range $paginator.Pages }}
diff --git a/layouts/taxonomy/category.terms.html b/layouts/taxonomy/category.terms.html
index c9ef0d1..275e346 100644
--- a/layouts/taxonomy/category.terms.html
+++ b/layouts/taxonomy/category.terms.html
@@ -1,4 +1,4 @@
-{{ if $.Site.Params.hierarchical_categories }}
+{{ if $.Site.Params.hierarchicalCategories }}
   {{ $.Scratch.Set "max-level" 0 }}
   {{ range where $.Site.Pages "Type" "post" }}
     {{ $page := . }}
@@ -51,7 +51,7 @@
               data-message-one="{{ i18n "global.categories_found.one" }}"
               data-message-other="{{ i18n "global.categories_found.other" }}"></h5>
           <section class="boxes">
-            {{ if $.Site.Params.hierarchical_categories }}
+            {{ if $.Site.Params.hierarchicalCategories }}
               {{ range $.Scratch.GetSortedMapValues "categories-level-0" }}
                 {{ $path := .path }}
                 <div>
@@ -73,7 +73,7 @@
             {{ end }}
           </section>
           <section class="boxes">
-            {{ if $.Site.Params.hierarchical_categories }}
+            {{ if $.Site.Params.hierarchicalCategories }}
               {{ range $.Scratch.GetSortedMapValues "categories-level-0" }}
                 {{ $path := .path }}
                 <div id="posts-list-{{ .name | urlize }}" class="archive box" data-category="{{ .name }}" data-parent-categories="" style="display: block;">
diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html
index 74806c3..9d9d9f3 100644
--- a/layouts/taxonomy/tag.html
+++ b/layouts/taxonomy/tag.html
@@ -3,14 +3,14 @@
     <div id="blog">
       {{ partial "header.html" . }}
       {{ partial "sidebar.html" . }}
-      {{ if or (not (isset .Site.Params "tag_pagination")) (.Site.Params.tag_pagination) }}
+      {{ if or (not (isset .Site.Params "tagPagination")) (.Site.Params.tagPagination) }}
         {{ partial "post/header-cover.html" . }}
       {{ end }}
       <div id="main" data-behavior="{{ .Scratch.Get "sidebarBehavior" }}"
         class="{{ with .Params.coverimage }}hasCover{{ end }}
                {{ if eq .Params.covermeta "out" }}hasCoverMetaOut{{ else }}hasCoverMetaIn{{ end }}
                {{ with .Params.coverCaption }}hasCoverCaption{{ end }}">
-        {{ if or (not (isset .Site.Params "tag_pagination")) (.Site.Params.tag_pagination) }}
+        {{ if or (not (isset .Site.Params "tagPagination")) (.Site.Params.tagPagination) }}
           <section class="postShorten-group main-content-wrap">
             {{ $paginator := .Paginate (where .Data.Pages "Type" "post") }}
             {{ range $paginator.Pages }}