diff --git a/src/mibew/styles/pages/default/templates_src/server_side/layout.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars
similarity index 100%
rename from src/mibew/styles/pages/default/templates_src/server_side/layout.handlebars
rename to src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/avatar.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/avatar.handlebars
index 049ed6a6..9b1338ab 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/avatar.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/avatar.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/ban.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/ban.handlebars
index 3e0fc337..dfe3d31c 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/ban.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/ban.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "content"}}
         {{#if saved}}
             {{l10n "page_ban.sent" address}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/blocked_visitors.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/blocked_visitors.handlebars
index 78b3fce9..623d73fd 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/blocked_visitors.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/blocked_visitors.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "head"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/canned.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/canned.handlebars
index ea1206ac..542745da 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/canned.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/canned.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/canned_edit.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/canned_edit.handlebars
index 136d7bfd..c06f1e59 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/canned_edit.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/canned_edit.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "content"}}
         {{#if saved}}
             {{l10n "cannededit.done"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/confirm.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/confirm.handlebars
index c686a0a2..b7aef6bb 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/confirm.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/confirm.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "content"}}
         <div id="confirmpane">
             <div class="mform">
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/features.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/features.handlebars
index 2c3fba73..e1604c5c 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/features.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/features.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "head"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/get_code.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/get_code.handlebars
index 8accbab4..936b798f 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/get_code.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/get_code.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/group.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/group.handlebars
index 495f0c44..3942fe85 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/group.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/group.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "head"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/group_members.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/group_members.handlebars
index fcb88fa4..44765ea8 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/group_members.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/group_members.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/groups.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/groups.handlebars
index 3b00e0f2..37cdbd6a 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/groups.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/groups.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "head"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/history.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/history.handlebars
index ce93de91..693365c7 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/history.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/history.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars
index 5b621bbe..aab8c6eb 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "head"}}
         {{#if localeLinks}}
             <script type="text/javascript" language="javascript" src="{{mibewRoot}}/js/libs/jquery.min.js"></script>
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/install_err.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/install_err.handlebars
index d7a3abf1..0d248c7b 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/install_err.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/install_err.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "content"}}
         {{> _errors}}
 
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/install_index.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/install_index.handlebars
index f42bb413..a98884eb 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/install_index.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/install_index.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#if localeLinks}}
         {{#override "menu"}}{{> _locales}}{{/override}}
     {{/if}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/invitation_themes.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/invitation_themes.handlebars
index 043cc32a..dfcdba53 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/invitation_themes.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/invitation_themes.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "head"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/license.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/license.handlebars
index 24b3112d..360051db 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/license.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/license.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "content"}}
         <p>Copyright 2005-2013 the original author or authors.</p>
 
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/login.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/login.handlebars
index 4ab94836..4b6fc61b 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/login.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/login.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#if localeLinks}}
         {{#override "menu"}}{{> _locales}}{{/override}}
     {{/if}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/operator.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/operator.handlebars
index 08652125..45e00d11 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/operator.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/operator.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/operator_groups.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/operator_groups.handlebars
index 3332717a..92c9e14a 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/operator_groups.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/operator_groups.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/operators.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/operators.handlebars
index 3004ba69..32b368b8 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/operators.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/operators.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "head"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/page_themes.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/page_themes.handlebars
index e7f4bf2a..1f1e0db6 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/page_themes.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/page_themes.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/performance.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/performance.handlebars
index 69fd9f12..00b47d60 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/performance.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/performance.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/permissions.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/permissions.handlebars
index b2f83352..04a0289c 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/permissions.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/permissions.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/resetpwd.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/resetpwd.handlebars
index 0bfe1102..38e8fa41 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/resetpwd.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/resetpwd.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#if localeLinks}}
         {{#override "menu"}}{{> _locales}}{{/override}}
     {{/if}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/restore.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/restore.handlebars
index 136bad45..ccee4a2c 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/restore.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/restore.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#if localeLinks}}
         {{#override "menu"}}{{> _locales}}{{/override}}
     {{/if}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/settings.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/settings.handlebars
index 8a380937..ff8c8995 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/settings.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/settings.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/statistics.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/statistics.handlebars
index 9a2bdc2c..3e12ceb2 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/statistics.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/statistics.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/themes.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/themes.handlebars
index da59cd31..ae930a39 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/themes.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/themes.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/thread_log.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/thread_log.handlebars
index 5c015901..78a26aea 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/thread_log.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/thread_log.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "head"}}
         <!-- External libs -->
         <script type="text/javascript" src="{{mibewRoot}}/js/libs/jquery.min.js"></script>
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/tracked.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/tracked.handlebars
index 3d94c5b3..aceecac4 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/tracked.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/tracked.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "content"}}
         {{l10n "tracked.intro"}}
 
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/translate.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/translate.handlebars
index fb493e98..c4eee921 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/translate.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/translate.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "content"}}
         {{#if saved}}
             {{l10n "page.translate.done"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/translate_list.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/translate_list.handlebars
index 4fa0fd8a..32b2fd0d 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/translate_list.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/translate_list.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "content"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/updates.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/updates.handlebars
index d2b6767c..457484d6 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/updates.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/updates.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "menu"}}{{> _menu}}{{/override}}
 
     {{#override "head"}}
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/user_history.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/user_history.handlebars
index 61998641..922e4af2 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/user_history.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/user_history.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#override "content"}}
         {{l10n "page.analysis.userhistory.intro"}}
 
diff --git a/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars
index 6c5c5444..e93d9a65 100644
--- a/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars
+++ b/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars
@@ -1,4 +1,4 @@
-{{#extends "layout"}}
+{{#extends "_layout"}}
     {{#if havemenu}}
         {{#override "menu"}}{{> _menu}}{{/override}}
     {{/if}}