diff --git a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
index d497a6e60..6181f277b 100644
--- a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
@@ -1,7 +1,7 @@
 <?page title="${i18n:_('Navalpro: AdvanceTypes')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="List"?>
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
 <?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/calendars/calendars.zul b/navalplanner-webapp/src/main/webapp/calendars/calendars.zul
index cdaa8d705..6a5f3c295 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/calendars.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/calendars.zul
@@ -2,7 +2,7 @@
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
 <?page  id="List"?>
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
 <?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul b/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul
index bcb2dfbe2..b97137df9 100644
--- a/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul
+++ b/navalplanner-webapp/src/main/webapp/common/concurrent_modification.zul
@@ -1,4 +1,4 @@
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
 <zk>
diff --git a/navalplanner-webapp/src/main/webapp/common/error.zul b/navalplanner-webapp/src/main/webapp/common/error.zul
index f31cadde2..5a7f105ed 100644
--- a/navalplanner-webapp/src/main/webapp/common/error.zul
+++ b/navalplanner-webapp/src/main/webapp/common/error.zul
@@ -1,4 +1,4 @@
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
 <zk>
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template_v02.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
similarity index 100%
rename from navalplanner-webapp/src/main/webapp/common/layout/template_v02.zul
rename to navalplanner-webapp/src/main/webapp/common/layout/template.zul
diff --git a/navalplanner-webapp/src/main/webapp/common/page_not_found.zul b/navalplanner-webapp/src/main/webapp/common/page_not_found.zul
index b75a4bfbc..030a6509b 100644
--- a/navalplanner-webapp/src/main/webapp/common/page_not_found.zul
+++ b/navalplanner-webapp/src/main/webapp/common/page_not_found.zul
@@ -1,4 +1,4 @@
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
 <zk>
diff --git a/navalplanner-webapp/src/main/webapp/orders/orders.zul b/navalplanner-webapp/src/main/webapp/orders/orders.zul
index 343d27eae..418aa5e57 100644
--- a/navalplanner-webapp/src/main/webapp/orders/orders.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/orders.zul
@@ -1,7 +1,7 @@
 <?page title="${i18n:_('Navalpro: Orders')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="List"?>
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
 <?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/planner/main.zul b/navalplanner-webapp/src/main/webapp/planner/main.zul
index ec932de07..543b19884 100644
--- a/navalplanner-webapp/src/main/webapp/planner/main.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/main.zul
@@ -1,6 +1,6 @@
 <?page title="${i18n:_('Navalpro: Scheduling')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
 <?link rel="stylesheet" type="text/css" href="/planner/css/ganttzk.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul
index 5f59d2911..14518d57f 100644
--- a/navalplanner-webapp/src/main/webapp/planner/order.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/order.zul
@@ -1,5 +1,5 @@
 <?page title="${i18n:_('Navalpro: Scheduling')}"?>
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
diff --git a/navalplanner-webapp/src/main/webapp/planner/resources_use.zul b/navalplanner-webapp/src/main/webapp/planner/resources_use.zul
index 0d1ea91bc..3a7bc99b9 100644
--- a/navalplanner-webapp/src/main/webapp/planner/resources_use.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/resources_use.zul
@@ -1,6 +1,6 @@
 <?page title="${i18n:_('Navalpro: Scheduling')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/planner/css/ganttzk.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul
index 218493d1e..128b42804 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul
@@ -1,6 +1,6 @@
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="criterions_admin"?>
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
 <?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul b/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
index 0e04ba1f0..0fa1f5852 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
@@ -1,7 +1,7 @@
 <?page title="${i18n:_('Resources')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="Create"?>
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
 <?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReport.zul b/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
index d576d042f..145ff608e 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
@@ -1,6 +1,6 @@
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page id="work_report_admin"?>
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
 <?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul b/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
index 2178b433d..fa5bcce90 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/workReportTypes.zul
@@ -1,6 +1,6 @@
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="List"?>
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_v02.zul"?>
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
 <?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>