diff --git a/exampleSite/README.md b/exampleSite/README.md
index 90a45bfbcd..c861e7563c 100644
--- a/exampleSite/README.md
+++ b/exampleSite/README.md
@@ -1,12 +1,11 @@
 - récriture doc -> TODO
     - créer une section Showcase
+- Menus déroulants icone -> TODO
+
 - créer des jolis thèmes de base (avec des noms ou au moins de meilleures couleurs) -> DOING
     - Thème blue : OK
     - Thème red: OK
     - Theme green: OK
-- Menus déroulants icone -> TODO
-
-
 - Passer a Wercker -> OK
 - corriger le multilangue pour la recherche et les autres ressources statiques : OK
 - Section "MORE" -> OK
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index d928816a4b..f3f8029a97 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -12,13 +12,7 @@ defaultContentLanguageInSubdir= true
   editURL = "https://github.com/matcornic/hugo-theme-learn/edit/master/docs/content/"
   description = "Documentation for Hugo Learn Theme"
   author = "Mathieu Cornic"
-  disableSearch = false # default to false
-  disableAssetBusting = false # default to false
-  ordersectionsby = "weight" # ordersectionsby = "title"
-  disableInlineCopyToClipBoard = true # default to false
   showVisitedLinks = true
-  themeVariant = "red"
-  enableShortcutsTitle = true
 
 [outputs]
 home = [ "HTML", "RSS", "JSON"]
@@ -38,7 +32,7 @@ weight = 10
 
 [[Languages.en.menu.shortcuts]]
 name = "<i class='fa fa-camera'></i> Showcases"
-url = "/showcase"
+url = "/en/showcase"
 weight = 11
 
 [[Languages.en.menu.shortcuts]]
@@ -49,7 +43,7 @@ weight = 20
 
 [[Languages.en.menu.shortcuts]]
 name = "<i class='fa fa-bullhorn'></i> Credits"
-url = "/credits"
+url = "/en/credits"
 weight = 30
 
 [Languages.fr]
diff --git a/i18n/en.toml b/i18n/en.toml
index 56a1af4fc5..6c952fbe5c 100644
--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -17,7 +17,7 @@ other = "Woops. Looks like this page doesn't exist ¯\\_(ツ)_/¯."
 other = "Go to homepage"
 
 [Edit-this-page]
-other = "Edit page"
+other = "Edit this page"
 
 [Shortcuts-Title]
 other = "More"
\ No newline at end of file
diff --git a/layouts/404.html b/layouts/404.html
index 556cbcecb9..1fc6265e2a 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8"> {{ partial "meta.html" . }} {{ partial "favicon.html" . }} {{ .Scratch.Add "title" "" }}{{ if eq .Site.Data.titles .Title }}{{ .Scratch.Set "title" (index .Site.Data.titles .Title).title }}{{ else }}{{ .Scratch.Set "title" .Title}}{{end}}
   <title>{{ .Scratch.Get "title" }}</title>
   
-   {{ $assetBusting := not .Site.Params.disableAssetBusting }}
+   {{ $assetBusting := not .Site.Params.disableAssetsBusting }}
     <link href="{{"css/nucleus.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
     <link href="{{"css/font-awesome.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
     <link href="{{"css/hybrid.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 65bd3756d2..734dd347d0 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -52,20 +52,20 @@
     <div style="left: -1000px; overflow: scroll; position: absolute; top: -1000px; border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;">
       <div style="border: none; box-sizing: content-box; height: 200px; margin: 0px; padding: 0px; width: 200px;"></div>
     </div>
-    <script src="{{"js/clipboard.min.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/perfect-scrollbar.min.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/perfect-scrollbar.jquery.min.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/jquery.sticky-kit.min.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/featherlight.min.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/html5shiv-printshiv.min.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/highlight.pack.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/clipboard.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/perfect-scrollbar.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/perfect-scrollbar.jquery.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/jquery.sticky-kit.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/featherlight.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/html5shiv-printshiv.min.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/highlight.pack.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
     <script>hljs.initHighlightingOnLoad();</script>
-    <script src="{{"js/modernizr.custom.71422.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/learn.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
-    <script src="{{"js/hugo-learn.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/modernizr.custom.71422.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/learn.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <script src="{{"js/hugo-learn.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
 
-    <link href="{{"mermaid/mermaid.css" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}" type="text/css" rel="stylesheet" />
-    <script src="{{"mermaid/mermaid.js" | relURL}}{{ if not .Site.Params.disableAssetBusting }}?{{ now.Unix }}{{ end }}"></script>
+    <link href="{{"mermaid/mermaid.css" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}" type="text/css" rel="stylesheet" />
+    <script src="{{"mermaid/mermaid.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
     <script>
         mermaid.initialize({ startOnLoad: true });
     </script>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index d9d2468981..51a5f12846 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -8,7 +8,7 @@
     {{ partial "favicon.html" . }}
     <title>{{ .Title }} :: {{ .Site.Title }}</title>
     
-    {{ $assetBusting := not .Site.Params.disableAssetBusting }}
+    {{ $assetBusting := not .Site.Params.disableAssetsBusting }}
     <link href="{{"css/nucleus.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
     <link href="{{"css/font-awesome.min.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
     <link href="{{"css/hybrid.css" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="stylesheet">
diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html
index f9de567d1c..60c3d8ad8b 100644
--- a/layouts/partials/menu.html
+++ b/layouts/partials/menu.html
@@ -25,10 +25,10 @@
         {{end}} 
     </ul>
 
-    {{ $enableShortcutsTitle := .Site.Params.EnableShortcutsTitle}}
+    {{ $disableShortcutsTitle := .Site.Params.DisableShortcutsTitle}}
     {{with .Site.Menus.shortcuts}}
       <section id="shortcuts">
-        <h3>{{ if $enableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}</h3>
+        <h3>{{ if not $disableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}</h3>
         <ul>
           {{ range sort . "Weight"}}
               <li class="" role=""> 
diff --git a/layouts/partials/search.html b/layouts/partials/search.html
index 6db61ccd51..180c322e2d 100644
--- a/layouts/partials/search.html
+++ b/layouts/partials/search.html
@@ -3,8 +3,9 @@
     <input data-search-input id="search-by" type="text" placeholder="{{T "Search-placeholder"}}">
     <span data-search-clear=""><i class="fa fa-close"></i></span>
 </div>
-<script type="text/javascript" src="{{"js/lunr.min.js" | relURL}}"></script>
-<script type="text/javascript" src="{{"js/horsey.js" | relURL}}"></script>
+{{ $assetBusting := not .Site.Params.disableAssetsBusting }}
+<script type="text/javascript" src="{{"js/lunr.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
+<script type="text/javascript" src="{{"js/horsey.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
 <script type="text/javascript">
     {{ if .Site.IsMultiLingual }}
         var baseurl = "{{.Site.BaseURL}}{{.Site.LanguagePrefix}}";
@@ -12,4 +13,4 @@
         var baseurl = "{{.Site.BaseURL}}";
     {{ end }}
 </script>
-<script type="text/javascript" src="{{"js/search.js" | relURL}}"></script>
+<script type="text/javascript" src="{{"js/search.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
diff --git a/static/css/theme.css b/static/css/theme.css
index 7051821110..511b17fe28 100644
--- a/static/css/theme.css
+++ b/static/css/theme.css
@@ -59,6 +59,7 @@ a:hover {
 }
 pre {
     position: relative;
+    color: #ffffff;
 }
 .bg {
     background: #fff;
diff --git a/static/js/learn.js b/static/js/learn.js
index ab67ac37e9..857f8083e7 100644
--- a/static/js/learn.js
+++ b/static/js/learn.js
@@ -164,7 +164,13 @@ jQuery(document).ready(function() {
         $('[data-search-input]').val(searchValue);
         $('[data-search-input]').trigger('input');
         var searchedElem = $('#body-inner').find(':contains(' + searchValue + ')').get(0);
-        searchedElem && searchedElem.scrollIntoView();
+        if (searchedElem) {
+            searchedElem.scrollIntoView(true);
+            var scrolledY = window.scrollY;
+            if(scrolledY){
+                window.scroll(0, scrolledY - 125);
+            }
+        }
     }
 
     // clipboard