diff --git a/templates/html/Wize.html b/templates/html/Wize.html
index 95aa07d..49fe9fa 100644
--- a/templates/html/Wize.html
+++ b/templates/html/Wize.html
@@ -5,7 +5,7 @@
 	<title>[% title %]</title>
 	<meta name='Generator' content='[% generator.name %]'>
 	<link rel="stylesheet"
-        href="[% resource('common/zim-variables.css') %]" >
+      href="[% resource('common-spec/zim-variables.css') %]" >
     <link rel="stylesheet"
       href="[% resource('common/zim-style.css') %]" >
     <link rel="stylesheet"
@@ -100,7 +100,7 @@
 <td class='navigation'>
 [% IF navigation.prev %]
     <a href='[% uri(navigation.prev) %]'>
-    <img src="[% resource('common/arrow-left.png') %]" alt="[% gettext('Prev') %]" title="[% gettext('Prev') %]">
+    <img src="[% resource('common-spec/arrow-left.png') %]" alt="[% gettext('Prev') %]" title="[% gettext('Prev') %]">
     </a>
 [% ELSE %]
 <!--
@@ -111,7 +111,7 @@
 <td class='navigation'>
 [% IF links.get("index") %]
     <a href='[% uri(links.get("index")) %]'>
-    <img src="[% resource('common/arrow-up.png') %]" alt="[% gettext('Index') %]" title="[% gettext('Index') %]">
+    <img src="[% resource('common-spec/arrow-up.png') %]" alt="[% gettext('Index') %]" title="[% gettext('Index') %]">
     </a>
 [% ELSE %]
 <!--
@@ -122,7 +122,7 @@
 <td class='navigation'>
 [% IF navigation.next %]
     <a href='[% uri(navigation.next) %]'>
-    <img src="[% resource('common/arrow-right.png') %]" alt="[% gettext('Next') %]" title="[% gettext('Next') %]">
+    <img src="[% resource('common-spec/arrow-right.png') %]" alt="[% gettext('Next') %]" title="[% gettext('Next') %]">
     </a>
 [% ELSE %]
 <!--
@@ -147,7 +147,7 @@
 [% FOR page IN pages %]
 [% FOR link IN page.backlinks %]
 [% IF loop.first %]<a href="#backlinks">
-<img src='[% resource("common/backlink.png") %]' alt='[% gettext("Backlinks:") %]' title='[% gettext("Backlinks:") %]'>
+<img src='[% resource("common-spec/backlink.png") %]' alt='[% gettext("Backlinks:") %]' title='[% gettext("Backlinks:") %]'>
 </a>[% END %]
 [% END %]
 [% END %]
@@ -156,7 +156,7 @@
 [% FOR page IN pages %]
 [% FOR file IN page.attachments %]
 [% IF loop.first %]<a href="#attach">
-<img src='[% resource("common/attachment.png") %]' alt='[% gettext("Attachments:") %]' title='[% gettext("Attachments:") %]'>
+<img src='[% resource("common-spec/attachment.png") %]' alt='[% gettext("Attachments:") %]' title='[% gettext("Attachments:") %]'>
 </a>[% END %]
 [% END %]
 [% END %]
@@ -170,7 +170,7 @@
 </div>
 
 <div style="float:right">
-<img src='[% resource("logo.png") %]' alt=' '>
+<img src='[% resource("common-spec/logo.png") %]' alt=' '>
 </div>
 
 <!-- Wiki content -->
diff --git a/templates/html/Wize_Print.html b/templates/html/Wize_Print.html
index bad482c..fa92adc 100644
--- a/templates/html/Wize_Print.html
+++ b/templates/html/Wize_Print.html
@@ -7,7 +7,7 @@
     <!-- ATTENTION Le template Print ne supporte pas les ressources,
 	     Il faut mettre des chemins absolus sur les fichiers :( -->
     <link rel="stylesheet"
-      href="file:////home/daniau/.local/share/zim/templates/html/common/zim-variables.css" >	     
+      href="file:////home/daniau/.local/share/zim/templates/html/common-wize/zim-variables.css" >	     
     <link rel="stylesheet"
       href="file:////home/daniau/.local/share/zim/templates/html/common/zim-style.css" >
     <link rel="stylesheet"
@@ -48,7 +48,7 @@
 <!-- Wiki content -->
 
 <div style="float:right">
-<img src="file:////home/daniau/.local/share/zim/templates/html/Wize/logo.png" alt=' '>
+<img src="file:////home/daniau/.local/share/zim/templates/html/common-wize/logo.png" alt=' '>
 </div>
 
 
diff --git a/templates/html/Wize_with_index.html b/templates/html/Wize_with_index.html
index eeec9cf..7c3446f 100644
--- a/templates/html/Wize_with_index.html
+++ b/templates/html/Wize_with_index.html
@@ -5,7 +5,7 @@
     <title>[% title %]</title>
     <meta name='Generator' content='[% generator.name %]'>
     <link rel="stylesheet"
-        href="[% resource('common/zim-variables.css') %]" >
+        href="[% resource('common-spec/zim-variables.css') %]" >
     <link rel="stylesheet"
         href="[% resource('common/zim-style.css') %]" >
     <link rel="stylesheet"
@@ -146,28 +146,28 @@
 <td class='navigation'>
 [% IF navigation.prev %]
     <a href='[% uri(navigation.prev) %]'>
-    <img src="[% resource('common/arrow-left.png') %]" alt="[% gettext('Prev') %]" title="[% gettext('Prev') %]">
+    <img src="[% resource('common-spec/arrow-left.png') %]" alt="[% gettext('Prev') %]" title="[% gettext('Prev') %]">
     </a>
 [% ELSE %]
-    <img src="[% resource('common/arrow-left-inact.png') %]" alt="[% gettext('Prev') %]" title="[% gettext('Prev') %]">
+    <img src="[% resource('common-spec/arrow-left-inact.png') %]" alt="[% gettext('Prev') %]" title="[% gettext('Prev') %]">
 [% END %]
 </td>
 <td class='navigation'>
 [% IF links.get("index") %]
     <a href='[% uri(links.get("index")) %]'>
-    <img src="[% resource('common/arrow-up.png') %]" alt="[% gettext('Index') %]" title="[% gettext('Index') %]">
+    <img src="[% resource('common-spec/arrow-up.png') %]" alt="[% gettext('Index') %]" title="[% gettext('Index') %]">
     </a>
 [% ELSE %]
-    <img src="[% resource('common/arrow-up-inact.png') %]" alt="[% gettext('Index') %]" title="[% gettext('Index') %]">
+    <img src="[% resource('common-spec/arrow-up-inact.png') %]" alt="[% gettext('Index') %]" title="[% gettext('Index') %]">
 [% END %]
 </td>
 <td class='navigation'>
 [% IF navigation.next %]
     <a href='[% uri(navigation.next) %]'>
-    <img src="[% resource('common/arrow-right.png') %]" alt="[% gettext('Next') %]" title="[% gettext('Next') %]">
+    <img src="[% resource('common-spec/arrow-right.png') %]" alt="[% gettext('Next') %]" title="[% gettext('Next') %]">
     </a>
 [% ELSE %]
-    <img src="[% resource('common/arrow-right-inact.png') %]" alt="[% gettext('Next') %]" title="[% gettext('Next') %]">
+    <img src="[% resource('common-spec/arrow-right-inact.png') %]" alt="[% gettext('Next') %]" title="[% gettext('Next') %]">
 [% END %]
 </td>
 </tr>
@@ -187,7 +187,7 @@
 [% FOR page IN pages %]
 [% FOR link IN page.backlinks %]
 [% IF loop.first %]<a href="#backlinks">
-<img src='[% resource("common/backlink.png") %]' alt='[% gettext("Backlinks:") %]' title='[% gettext("Backlinks:") %]'>
+<img src='[% resource("common-spec/backlink.png") %]' alt='[% gettext("Backlinks:") %]' title='[% gettext("Backlinks:") %]'>
 </a>[% END %]
 [% END %]
 [% END %]
@@ -196,7 +196,7 @@
 [% FOR page IN pages %]
 [% FOR file IN page.attachments %]
 [% IF loop.first %]<a href="#attach">
-<img src='[% resource("common/attachment.png") %]' alt='[% gettext("Attachments:") %]' title='[% gettext("Attachments:") %]'>
+<img src='[% resource("common-spec/attachment.png") %]' alt='[% gettext("Attachments:") %]' title='[% gettext("Attachments:") %]'>
 </a>[% END %]
 [% END %]
 [% END %]
@@ -210,7 +210,7 @@
 </div>
 
 <div style="float:right">
-<img src='[% resource("logo.png") %]' alt=' '>
+<img src='[% resource("common-spec/logo.png") %]' alt=' '>
 </div>
 
 <div id="mySidenav" class="menu menuClosed">
diff --git a/templates/html/Wize_with_index_sod.html b/templates/html/Wize_with_index_sod.html
index 1b2296e..e587dd2 100644
--- a/templates/html/Wize_with_index_sod.html
+++ b/templates/html/Wize_with_index_sod.html
@@ -5,7 +5,7 @@
     <title>[% title %]</title>
     <meta name='Generator' content='[% generator.name %]'>
     <link rel="stylesheet"
-        href="[% resource('common/zim-variables.css') %]" >
+        href="[% resource('common-spec/zim-variables.css') %]" >
     <link rel="stylesheet"
         href="[% resource('common/zim-style.css') %]" >
     <link rel="stylesheet"
@@ -158,28 +158,28 @@
 <td class='navigation'>
 [% IF navigation.prev %]
     <a href='[% uri(navigation.prev) %]'>
-    <img src="[% resource('common/arrow-left.png') %]" alt="[% gettext('Prev') %]" title="[% gettext('Prev') %]">
+    <img src="[% resource('common-spec/arrow-left.png') %]" alt="[% gettext('Prev') %]" title="[% gettext('Prev') %]">
     </a>
 [% ELSE %]
-    <img src="[% resource('common/arrow-left-inact.png') %]" alt="[% gettext('Prev') %]" title="[% gettext('Prev') %]">
+    <img src="[% resource('common-spec/arrow-left-inact.png') %]" alt="[% gettext('Prev') %]" title="[% gettext('Prev') %]">
 [% END %]
 </td>
 <td class='navigation'>
 [% IF links.get("index") %]
     <a href='[% uri(links.get("index")) %]'>
-    <img src="[% resource('common/arrow-up.png') %]" alt="[% gettext('Index') %]" title="[% gettext('Index') %]">
+    <img src="[% resource('common-spec/arrow-up.png') %]" alt="[% gettext('Index') %]" title="[% gettext('Index') %]">
     </a>
 [% ELSE %]
-    <img src="[% resource('common/arrow-up-inact.png') %]" alt="[% gettext('Index') %]" title="[% gettext('Index') %]">
+    <img src="[% resource('common-spec/arrow-up-inact.png') %]" alt="[% gettext('Index') %]" title="[% gettext('Index') %]">
 [% END %]
 </td>
 <td class='navigation'>
 [% IF navigation.next %]
     <a href='[% uri(navigation.next) %]'>
-    <img src="[% resource('common/arrow-right.png') %]" alt="[% gettext('Next') %]" title="[% gettext('Next') %]">
+    <img src="[% resource('common-spec/arrow-right.png') %]" alt="[% gettext('Next') %]" title="[% gettext('Next') %]">
     </a>
 [% ELSE %]
-    <img src="[% resource('common/arrow-right-inact.png') %]" alt="[% gettext('Next') %]" title="[% gettext('Next') %]">
+    <img src="[% resource('common-spec/arrow-right-inact.png') %]" alt="[% gettext('Next') %]" title="[% gettext('Next') %]">
 [% END %]
 </td>
 </tr>
@@ -199,7 +199,7 @@
 [% FOR page IN pages %]
 [% FOR link IN page.backlinks %]
 [% IF loop.first %]<a href="#backlinks">
-<img src='[% resource("common/backlink.png") %]' alt='[% gettext("Backlinks:") %]' title='[% gettext("Backlinks:") %]'>
+<img src='[% resource("common-spec/backlink.png") %]' alt='[% gettext("Backlinks:") %]' title='[% gettext("Backlinks:") %]'>
 </a>[% END %]
 [% END %]
 [% END %]
@@ -208,7 +208,7 @@
 [% FOR page IN pages %]
 [% FOR file IN page.attachments %]
 [% IF loop.first %]<a href="#attach">
-<img src='[% resource("common/attachment.png") %]' alt='[% gettext("Attachments:") %]' title='[% gettext("Attachments:") %]'>
+<img src='[% resource("common-spec/attachment.png") %]' alt='[% gettext("Attachments:") %]' title='[% gettext("Attachments:") %]'>
 </a>[% END %]
 [% END %]
 [% END %]
@@ -222,7 +222,7 @@
 </div>
 
 <div style="float:right">
-<img src='[% resource("logo.png") %]' alt=' '>
+<img src='[% resource("common-spec/logo.png") %]' alt=' '>
 </div>
 
 <div class="zemaster">