diff --git a/controllers/index.html b/controllers/index.html
diff --git a/cookbook/automating-controller-factories/index.html b/cookbook/automating-controller-factories/index.html
diff --git a/cookbook/middleware-in-listeners/index.html b/cookbook/middleware-in-listeners/index.html
diff --git a/css/fonts/FontAwesome.otf b/css/fonts/FontAwesome.otf
diff --git a/css/fonts/fontawesome-webfont.eot b/css/fonts/fontawesome-webfont.eot
diff --git a/css/fonts/fontawesome-webfont.svg b/css/fonts/fontawesome-webfont.svg
diff --git a/css/fonts/fontawesome-webfont.ttf b/css/fonts/fontawesome-webfont.ttf
diff --git a/css/fonts/fontawesome-webfont.woff b/css/fonts/fontawesome-webfont.woff
diff --git a/css/fonts/fontawesome-webfont.woff2 b/css/fonts/fontawesome-webfont.woff2
diff --git a/css/styles-482aa2add1.css b/css/styles-482aa2add1.css
diff --git a/css/styles-e3f3751b65.css b/css/styles-e3f3751b65.css
diff --git a/examples/index.html b/examples/index.html
diff --git a/img/grid1.png b/img/grid1.png
diff --git a/img/grid10.png b/img/grid10.png
diff --git a/img/grid11.png b/img/grid11.png
diff --git a/img/grid12.png b/img/grid12.png
diff --git a/img/grid13.png b/img/grid13.png
diff --git a/img/grid14.png b/img/grid14.png
diff --git a/img/grid15.png b/img/grid15.png
diff --git a/img/grid16.png b/img/grid16.png
diff --git a/img/grid17.png b/img/grid17.png
diff --git a/img/grid18.png b/img/grid18.png
diff --git a/img/grid19.png b/img/grid19.png
diff --git a/img/grid2.png b/img/grid2.png
diff --git a/img/grid20.png b/img/grid20.png
diff --git a/img/grid3.png b/img/grid3.png
diff --git a/img/grid4.png b/img/grid4.png
diff --git a/img/grid5.png b/img/grid5.png
diff --git a/img/grid6.png b/img/grid6.png
diff --git a/img/grid7.png b/img/grid7.png
diff --git a/img/grid8.png b/img/grid8.png
diff --git a/img/grid9.png b/img/grid9.png
diff --git a/img/zend-framework-logo.svg b/img/zend-framework-logo.svg
diff --git a/index.html b/index.html
diff --git a/intro/index.html b/intro/index.html
diff --git a/js/scripts-0b6185f4a5.js b/js/scripts-0b6185f4a5.js
diff --git a/js/scripts-dcbafde59f.js b/js/scripts-dcbafde59f.js
diff --git a/middleware/index.html b/middleware/index.html
diff --git a/migration/index.html b/migration/index.html
diff --git a/migration/to-v2-7/index.html b/migration/to-v2-7/index.html
diff --git a/migration/to-v3-0/index.html b/migration/to-v3-0/index.html
diff --git a/mvc-event/index.html b/mvc-event/index.html
diff --git a/plugins/index.html b/plugins/index.html
diff --git a/quick-start/index.html b/quick-start/index.html
diff --git a/routing/index.html b/routing/index.html
diff --git a/mkdocs/js/lunr.min.js → search/lunr.min.js b/mkdocs/js/lunr.min.js → search/lunr.min.js
diff --git a/mkdocs/js/mustache.min.js → search/mustache.min.js b/mkdocs/js/mustache.min.js → search/mustache.min.js
diff --git a/mkdocs/js/require.js → search/require.js b/mkdocs/js/require.js → search/require.js
diff --git a/mkdocs/js/search-results-template.mustache → search/search-results-template.mustache b/mkdocs/js/search-results-template.mustache → search/search-results-template.mustache
diff --git a/mkdocs/js/search.js → search/search.js b/mkdocs/js/search.js → search/search.js
@@ -1,8 +1,12 @@
+require.config({
+   baseUrl: base_url + "/search/"
+});
+
 require([
-    base_url + '/mkdocs/js/mustache.min.js',
-    base_url + '/mkdocs/js/lunr.min.js',
+    'mustache.min',
+    'lunr.min',
     'text!search-results-template.mustache',
-    'text!../search_index.json',
+    'text!search_index.json',
 ], function (Mustache, lunr, results_template, data) {
    "use strict";
 
@@ -83,6 +87,6 @@ require([
         search();
     }
 
-    search_input.addEventListener("keyup", search);
+    if (search_input){search_input.addEventListener("keyup", search);}
 
 });
diff --git a/mkdocs/search_index.json → search/search_index.json b/mkdocs/search_index.json → search/search_index.json
@@ -3,7 +3,7 @@
         {
             "location": "/",
             "text": "zend-mvc\n\n\n\n\n\n\nZend\\Mvc\n is a brand new MVC implementation designed from the ground up for\nZend Framework 2, focusing on performance and flexibility.\n\n\nThe MVC layer is built on top of the following components:\n\n\n\n\nZend\\ServiceManager\n - Zend Framework provides a set of default service\n  definitions set up at \nZend\\Mvc\\Service\n. The ServiceManager creates and\n  configures your application instance and workflow.\n\n\nZend\\EventManager\n - The MVC is event driven. This component is used\n  everywhere from initial bootstrapping of the application, through returning\n  response and request calls, to setting and retrieving routes and matched\n  routes, as well as render views.\n\n\n\n\nZend\\Http\n - specifically the request and response objects, used within:\n  \nZend\\Stdlib\\DispatchableInterface\n. All \u201ccontrollers\u201d are simply dispatchable\n  objects.\n\n\n\n\n\n\nFile issues at https://github.com/zendframework/zend-mvc/issues\n\n\n\n\nDocumentation is at https://docs.zendframework.com/zend-mvc/",
-            "title": "Home"
+            "title": "zend-mvc"
         },
         {
             "location": "/#zend-mvc",

diff --git a/mkdocs/js/text.js → search/text.js b/mkdocs/js/text.js → search/text.js
diff --git a/send-response-event/index.html b/send-response-event/index.html
diff --git a/services/index.html b/services/index.html
diff --git a/sitemap.xml b/sitemap.xml
@@ -4,23 +4,23 @@
 
     <url>
      <loc>/</loc>
-     <lastmod>2018-01-05</lastmod>
+     <lastmod>2018-05-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
 
 
     <url>
      <loc>/intro/</loc>
-     <lastmod>2018-01-05</lastmod>
+     <lastmod>2018-05-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
 
 
     <url>
      <loc>/quick-start/</loc>
-     <lastmod>2018-01-05</lastmod>
+     <lastmod>2018-05-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
@@ -29,49 +29,49 @@
 
     <url>
      <loc>/services/</loc>
-     <lastmod>2018-01-05</lastmod>
+     <lastmod>2018-05-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
     <url>
      <loc>/routing/</loc>
-     <lastmod>2018-01-05</lastmod>
+     <lastmod>2018-05-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
     <url>
      <loc>/mvc-event/</loc>
-     <lastmod>2018-01-05</lastmod>
+     <lastmod>2018-05-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
     <url>
      <loc>/send-response-event/</loc>
-     <lastmod>2018-01-05</lastmod>
+     <lastmod>2018-05-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
     <url>
      <loc>/controllers/</loc>
-     <lastmod>2018-01-05</lastmod>
+     <lastmod>2018-05-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
     <url>
      <loc>/plugins/</loc>
-     <lastmod>2018-01-05</lastmod>
+     <lastmod>2018-05-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
     <url>
      <loc>/examples/</loc>
-     <lastmod>2018-01-05</lastmod>
+     <lastmod>2018-05-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
     <url>
      <loc>/middleware/</loc>
-     <lastmod>2018-01-05</lastmod>
+     <lastmod>2018-05-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
@@ -87,13 +87,13 @@
 
     <url>
      <loc>/cookbook/automating-controller-factories/</loc>
-     <lastmod>2018-01-05</lastmod>
+     <lastmod>2018-05-22</lastmod>
      <changefreq>daily</changefreq>
     </url>
 
     <url>
      <loc>/cookbook/middleware-in-listeners/</loc>
-     <lastmod>2018-01-05</lastmod>
+     <lastmod>2018-05-22</lastmod>
      <changefreq>daily</changefreq>
     </url>