diff --git a/mandelstudio/templates/engine/pages/base_home_page.html b/mandelstudio/templates/engine/pages/base_home_page.html
index dcc77c7..6f1e6b7 100644
--- a/mandelstudio/templates/engine/pages/base_home_page.html
+++ b/mandelstudio/templates/engine/pages/base_home_page.html
@@ -1,5 +1,5 @@
 {% extends "layout.html" %}
-{% load wagtailcore_tags oxyan static string_filters mandelstudio_i18n %}
+{% load wagtailcore_tags oxyan static string_filters i18n %}
 
 {% block extrahead %}
   {{ block.super }}
@@ -32,9 +32,9 @@
 
 {% block layout %}
   <a class="btn btn-secondary hidelink" id="main_content_link" href="#skip_header" tabindex="2">
-    {% skip_to_content_text %}
+    {% if request.LANGUAGE_CODE == 'ru' %}Перейти к содержанию{% elif request.LANGUAGE_CODE == 'de' %}Zum Inhalt springen{% elif request.LANGUAGE_CODE == 'fr' %}Aller au contenu{% elif request.LANGUAGE_CODE == 'es' %}Ir al contenido{% elif request.LANGUAGE_CODE == 'it' %}Vai al contenuto{% elif request.LANGUAGE_CODE == 'pt' %}Ir para o conteúdo{% elif request.LANGUAGE_CODE == 'nl' %}Ga naar inhoud{% else %}Skip to content{% endif %}
   </a>
-  {% include "carbasa/headers/header.html" %}
+  {% include_header header_template|default:"engine/partials/header.html" %}
   <div id="main_content" tabindex="-1">
     <div class="te-modern-saas">
       {% if messages %}
@@ -59,9 +59,5 @@
       </main>
     </div>
   </div>
-  <div class="footer-corners">
-    {% include "svg/corner.svg" with class="left" %}
-    {% include "svg/corner.svg" with class="right" %}
-  </div>
   {% include "oxyan/partials/footer.html" %}
 {% endblock %}
diff --git a/mandelstudio/templates/engine/pages/base_standard_page.html b/mandelstudio/templates/engine/pages/base_standard_page.html
index ad98740..47ec543 100644
--- a/mandelstudio/templates/engine/pages/base_standard_page.html
+++ b/mandelstudio/templates/engine/pages/base_standard_page.html
@@ -1,5 +1,5 @@
 {% extends "layout.html" %}
-{% load wagtailcore_tags oxyan static string_filters mandelstudio_i18n %}
+{% load wagtailcore_tags oxyan static string_filters i18n %}
 
 {% block extrahead %}
   {{ block.super }}
@@ -32,9 +32,9 @@
 
 {% block layout %}
   <a class="btn btn-secondary hidelink" id="main_content_link" href="#skip_header" tabindex="2">
-    {% skip_to_content_text %}
+    {% if request.LANGUAGE_CODE == 'ru' %}Перейти к содержанию{% elif request.LANGUAGE_CODE == 'de' %}Zum Inhalt springen{% elif request.LANGUAGE_CODE == 'fr' %}Aller au contenu{% elif request.LANGUAGE_CODE == 'es' %}Ir al contenido{% elif request.LANGUAGE_CODE == 'it' %}Vai al contenuto{% elif request.LANGUAGE_CODE == 'pt' %}Ir para o conteúdo{% elif request.LANGUAGE_CODE == 'nl' %}Ga naar inhoud{% else %}Skip to content{% endif %}
   </a>
-  {% include "carbasa/headers/header.html" %}
+  {% include_header header_template|default:"engine/partials/header.html" %}
   <div id="main_content" tabindex="-1">
     <div class="te-modern-saas">
       {% if messages %}
@@ -62,9 +62,5 @@
       </main>
     </div>
   </div>
-  <div class="footer-corners">
-    {% include "svg/corner.svg" with class="left" %}
-    {% include "svg/corner.svg" with class="right" %}
-  </div>
   {% include "oxyan/partials/footer.html" %}
 {% endblock %}
diff --git a/mandelstudio/templates/engine/pages/engine_page.html b/mandelstudio/templates/engine/pages/engine_page.html
index aa266cf..aa34a52 100644
--- a/mandelstudio/templates/engine/pages/engine_page.html
+++ b/mandelstudio/templates/engine/pages/engine_page.html
@@ -1,5 +1,5 @@
 {% extends "layout.html" %}
-{% load wagtailcore_tags oxyan static string_filters mandelstudio_i18n %}
+{% load wagtailcore_tags oxyan static string_filters i18n %}
 
 {% block extrahead %}
   {{ block.super }}
@@ -32,9 +32,9 @@
 
 {% block layout %}
   <a class="btn btn-secondary hidelink" id="main_content_link" href="#skip_header" tabindex="2">
-    {% skip_to_content_text %}
+    {% if request.LANGUAGE_CODE == 'ru' %}Перейти к содержанию{% elif request.LANGUAGE_CODE == 'de' %}Zum Inhalt springen{% elif request.LANGUAGE_CODE == 'fr' %}Aller au contenu{% elif request.LANGUAGE_CODE == 'es' %}Ir al contenido{% elif request.LANGUAGE_CODE == 'it' %}Vai al contenuto{% elif request.LANGUAGE_CODE == 'pt' %}Ir para o conteúdo{% elif request.LANGUAGE_CODE == 'nl' %}Ga naar inhoud{% else %}Skip to content{% endif %}
   </a>
-  {% include "carbasa/headers/header.html" %}
+  {% include_header header_template|default:"engine/partials/header.html" %}
   <div id="main_content" tabindex="-1">
     <div class="te-modern-saas">
       <main>
@@ -48,9 +48,5 @@
       </main>
     </div>
   </div>
-  <div class="footer-corners">
-    {% include "svg/corner.svg" with class="left" %}
-    {% include "svg/corner.svg" with class="right" %}
-  </div>
   {% include "oxyan/partials/footer.html" %}
 {% endblock %}