diff --git a/layout/_layout.swig b/layout/_layout.swig
index 847309887b..ba5f79e10b 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -66,7 +66,7 @@
     <footer id="footer" class="footer">
       <div class="footer-inner">
         {{ partial('_partials/footer.swig', {}, {cache: theme.cache.enable}) }}
-        {% include '_partials/analytics/index.swig' %}
+        {{ partial('_partials/analytics/index.swig', {}, {cache: theme.cache.enable}) }}
         {% block footer %}{% endblock %}
       </div>
     </footer>
@@ -80,20 +80,11 @@
       </div>
     {%- endif %}
 
-    {% include '_partials/share/index.swig' %}
+    {{ partial('_partials/share/index.swig', {}, {cache: theme.cache.enable}) }}
   </div>
 
-  {% include '_scripts/vendors.swig' %}
-  {% include '_scripts/commons.swig' %}
-
-  {%- set scheme_script = '_scripts/schemes/' + theme.scheme | lower + '.swig' %}
-  {% include scheme_script %}
-
-  {% include '_scripts/next-boot.swig' %}
-  {% include '_scripts/exturl.swig' %}
-  {% include '_scripts/three.swig' %}
-
-  {% include '_third-party/index.swig' %}
+  {{ partial('_scripts/index.swig', {}, {cache: theme.cache.enable}) }}
+  {{ partial('_third-party/index.swig', {}, {cache: theme.cache.enable}) }}
 
   {%- if theme.pjax %}
     <div id="pjax">
diff --git a/layout/_partials/header/index.swig b/layout/_partials/header/index.swig
index 97f9b0fb25..2f451eb04f 100644
--- a/layout/_partials/header/index.swig
+++ b/layout/_partials/header/index.swig
@@ -1,5 +1,18 @@
 {{ partial('_partials/header/brand.swig', {}, {cache: theme.cache.enable}) }}
-{% include 'menu.swig' %}
+
+<nav class="site-nav">
+{{ partial('_partials/header/menu.swig', {}, {cache: theme.cache.enable}) }}
+
+{%- if theme.scheme === 'Muse' || theme.scheme === 'Mist' %}
+  {% include 'sub-menu.swig' %}
+{%- endif %}
+
+{%- if hasSearch %}
+  <div class="site-search">
+    {{ partial('_partials/search/index.swig', {}, {cache: theme.cache.enable}) }}
+  </div>
+{%- endif %}
+</nav>
 
 {%- for inject_item in theme.injects.header %}
   {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
diff --git a/layout/_partials/header/menu.swig b/layout/_partials/header/menu.swig
index 472782d5a5..8a9d2ea3df 100644
--- a/layout/_partials/header/menu.swig
+++ b/layout/_partials/header/menu.swig
@@ -1,48 +1,36 @@
 {% import '../../_macro/menu/menu-item.swig' as menu_item %}
 
-<nav class="site-nav">
-  {%- if theme.menu %}
-    <ul id="menu" class="menu">
-      {%- for name, path in theme.menu %}
-        {%- set respath = path %}
-        {%- if path == '[object Object]' %}
-        {# Main Menu (default menu item for Submenu) #}
-          {%- for subname, subpath in path %}
-            {%- set itemName = subname.toLowerCase() %}
-            {%- set respath = subpath %}
-            {%- if itemName == 'default' %}
-              {%- set itemName = name.toLowerCase() %}
-              {{ menu_item.render(name, respath) }}
-            {%- endif %}
-          {%- endfor %}
-        {% else %}
-        {# Main Menu (standart menu items) #}
-          {%- set itemName = name.toLowerCase() %}
-          {{- menu_item.render(name, respath) | trim -}}
-        {%- endif -%}
-      {%- endfor %}
+{%- if theme.menu %}
+  <ul id="menu" class="menu">
+    {%- for name, path in theme.menu %}
+      {%- set respath = path %}
+      {%- if path == '[object Object]' %}
+      {# Main Menu (default menu item for Submenu) #}
+        {%- for subname, subpath in path %}
+          {%- set itemName = subname.toLowerCase() %}
+          {%- set respath = subpath %}
+          {%- if itemName == 'default' %}
+            {%- set itemName = name.toLowerCase() %}
+            {{ menu_item.render(name, respath) }}
+          {%- endif %}
+        {%- endfor %}
+      {% else %}
+      {# Main Menu (standart menu items) #}
+        {%- set itemName = name.toLowerCase() %}
+        {{- menu_item.render(name, respath) | trim -}}
+      {%- endif -%}
+    {%- endfor %}
 
-      {%- set hasSearch = theme.algolia_search.enable || theme.local_search.enable %}
-      {%- if hasSearch %}
-        <li class="menu-item menu-item-search">
-          <a href="javascript:;" class="popup-trigger">
-          {%- if theme.menu_settings.icons %}
-            <i class="menu-item-icon fa fa-search fa-fw"></i> <br>{#
-          #}{%- endif %}{#
-          #}{{ __('menu.search') }}{#
-        #}</a>
-        </li>
-      {%- endif %}
-    </ul>
-  {%- endif %}
-
-  {%- if theme.scheme === 'Muse' || theme.scheme === 'Mist' %}
-    {% include 'sub-menu.swig' %}
-  {%- endif %}
-
-  {%- if hasSearch %}
-    <div class="site-search">
-      {% include '../search/index.swig' %}
-    </div>
-  {%- endif %}
-</nav>
+    {%- set hasSearch = theme.algolia_search.enable || theme.local_search.enable %}
+    {%- if hasSearch %}
+      <li class="menu-item menu-item-search">
+        <a href="javascript:;" class="popup-trigger">
+        {%- if theme.menu_settings.icons %}
+          <i class="menu-item-icon fa fa-search fa-fw"></i> <br>{#
+        #}{%- endif %}{#
+        #}{{ __('menu.search') }}{#
+      #}</a>
+      </li>
+    {%- endif %}
+  </ul>
+{%- endif %}
diff --git a/layout/_scripts/index.swig b/layout/_scripts/index.swig
new file mode 100644
index 0000000000..ec08956f8e
--- /dev/null
+++ b/layout/_scripts/index.swig
@@ -0,0 +1,9 @@
+{% include 'vendors.swig' %}
+{% include 'commons.swig' %}
+
+{%- set scheme_script = 'schemes/' + theme.scheme | lower + '.swig' %}
+{% include scheme_script %}
+
+{% include 'next-boot.swig' %}
+{% include 'exturl.swig' %}
+{% include 'three.swig' %}