diff --git a/.gitattributes b/.gitattributes
index bc480c3..a71f1db 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,23 +1,23 @@
 * text=auto !eol
 /body.html -text
-/habillage.css -text
-images/blockquote.png -text svneol=unset#unset
-images/image_02.jpg -text svneol=unset#unset
-images/image_03.jpg -text svneol=unset#unset
-images/image_04.jpg -text svneol=unset#unset
-images/image_05.jpg -text svneol=unset#unset
-images/out.gif -text svneol=unset#unset
-images/puce.png -text svneol=unset#unset
-images/templatemo_button.png -text svneol=unset#unset
-images/templatemo_button_hover.png -text svneol=unset#unset
-images/templatemo_content.jpg -text svneol=unset#unset
-images/templatemo_content_bottom.jpg -text svneol=unset#unset
-images/templatemo_header.jpg -text svneol=unset#unset
-images/templatemo_header_bg.png -text svneol=unset#unset
-images/templatemo_list.png -text svneol=unset#unset
-images/templatemo_logo.png -text svneol=unset#unset
-images/templatemo_menu_hover.png -text svneol=unset#unset
-images/templatemo_search.png -text svneol=unset#unset
+css/img/blockquote.png -text svneol=unset#unset
+css/img/out.gif -text svneol=unset#unset
+css/img/puce.png -text svneol=unset#unset
+css/img/templatemo_button.png -text svneol=unset#unset
+css/img/templatemo_button_hover.png -text svneol=unset#unset
+css/img/templatemo_content.jpg -text svneol=unset#unset
+css/img/templatemo_content_bottom.jpg -text svneol=unset#unset
+css/img/templatemo_header.jpg -text svneol=unset#unset
+css/img/templatemo_header_bg.png -text svneol=unset#unset
+css/img/templatemo_search.png -text svneol=unset#unset
+css/theme.css -text
+img/image_02.jpg -text svneol=unset#unset
+img/image_03.jpg -text svneol=unset#unset
+img/image_04.jpg -text svneol=unset#unset
+img/image_05.jpg -text svneol=unset#unset
+img/templatemo_list.png -text svneol=unset#unset
+img/templatemo_logo.png -text svneol=unset#unset
+img/templatemo_menu_hover.png -text svneol=unset#unset
 /inc-theme-copyleft.html -text
 origine/index.html -text
 origine/templatemo_style.css -text
diff --git a/body.html b/body.html
index f0da0aa..307921f 100644
--- a/body.html
+++ b/body.html
@@ -2,10 +2,10 @@
 
 	<div id="templatemo_header">
     
-   		<INCLURE{fond=inclure/entete,env}>
+   		<INCLURE{fond=header/#ENV{type-page},env} />
         
         <div id="templatemo_menu">
-			<INCLURE{fond=inclure/barre-nav,env}>    	
+			<INCLURE{fond=inclure/nav,env} />
         </div> <!-- end of templatemo_menu -->
         
     	<div class="cleaner"></div>
@@ -17,7 +17,7 @@
 <div id="templatemo_content_wrapper">
 	<div id="templatemo_content">
         <div class="content_section">
-			<INCLURE{fond=contenu/#ENV{type},env}>
+			<INCLURE{fond=content/#ENV{type-page},env} />
         </div>
     </div> <!-- end of content -->
 
@@ -25,21 +25,22 @@
     <div id="templatmeo_sidebar">
     
     	<div class="sidebar_section">
-			<INCLURE{fond=navigation/#ENV{type},env}>   
+			<INCLURE{fond=extra1/#ENV{type-page},env} />
         </div>
         
         <div class="cleaner_h30"></div>
         <div class="sidebar_section">
-			<INCLURE{fond=extra/#ENV{type},env}>	
+			<INCLURE{fond=extra2/#ENV{type-page},env} />
         </div>
 
 	</div> <!-- end of sidebar -->
     
   	<div class="cleaner"></div>    
 
-</div> <div id="templatemo_content_wrapper_bottom"></div> <!-- end of content_wrapper -->
+</div> 
+<div id="templatemo_content_wrapper_bottom"></div> <!-- end of content_wrapper -->
 
 <div id="templatemo_footer">
-	<div class='pied'><INCLURE{fond=inclure/pied,env}></div>
+	<div class='pied'><INCLURE{fond=footer/#ENV{type-page},env} /></div>
 	<div class='copyleft'><INCLURE{fond=inc-theme-copyleft}></div>
 </div> <!-- end of templatemo_footer -->
diff --git a/images/blockquote.png b/css/img/blockquote.png
similarity index 100%
rename from images/blockquote.png
rename to css/img/blockquote.png
diff --git a/images/out.gif b/css/img/out.gif
similarity index 100%
rename from images/out.gif
rename to css/img/out.gif
diff --git a/images/puce.png b/css/img/puce.png
similarity index 100%
rename from images/puce.png
rename to css/img/puce.png
diff --git a/images/templatemo_button.png b/css/img/templatemo_button.png
similarity index 100%
rename from images/templatemo_button.png
rename to css/img/templatemo_button.png
diff --git a/images/templatemo_button_hover.png b/css/img/templatemo_button_hover.png
similarity index 100%
rename from images/templatemo_button_hover.png
rename to css/img/templatemo_button_hover.png
diff --git a/images/templatemo_content.jpg b/css/img/templatemo_content.jpg
similarity index 100%
rename from images/templatemo_content.jpg
rename to css/img/templatemo_content.jpg
diff --git a/images/templatemo_content_bottom.jpg b/css/img/templatemo_content_bottom.jpg
similarity index 100%
rename from images/templatemo_content_bottom.jpg
rename to css/img/templatemo_content_bottom.jpg
diff --git a/images/templatemo_header.jpg b/css/img/templatemo_header.jpg
similarity index 100%
rename from images/templatemo_header.jpg
rename to css/img/templatemo_header.jpg
diff --git a/images/templatemo_header_bg.png b/css/img/templatemo_header_bg.png
similarity index 100%
rename from images/templatemo_header_bg.png
rename to css/img/templatemo_header_bg.png
diff --git a/images/templatemo_search.png b/css/img/templatemo_search.png
similarity index 100%
rename from images/templatemo_search.png
rename to css/img/templatemo_search.png
diff --git a/habillage.css b/css/theme.css
similarity index 89%
rename from habillage.css
rename to css/theme.css
index 4207810..7be614c 100644
--- a/habillage.css
+++ b/css/theme.css
@@ -20,7 +20,7 @@ a:active, a:hover { color: #0683ab; text-decoration: underline; }
 	width: 102px;
 	height: 23px;
 	padding: 7px 0 0 0;
-	background: url(images/templatemo_button.png)  no-repeat;
+	background: url(img/templatemo_button.png)  no-repeat;
 	color: #333;
 	font-size: 12px;
 	font-weight: bold;
@@ -30,7 +30,7 @@ a:active, a:hover { color: #0683ab; text-decoration: underline; }
 
 .button_01 a:hover {
 	color: #fff;
-    background:url(images/templatemo_button_hover.png) no-repeat;
+    background:url(img/templatemo_button_hover.png) no-repeat;
 }
 
 p { margin: 0px; padding: 0px; }
@@ -50,7 +50,7 @@ img { margin: 0px; padding: 0px; border: none; }
 #templatemo_header_wrapper {
 	width: 100%;
 	height: 265px;	
-	background: url(images/templatemo_header.jpg) no-repeat top center;
+	background: url(img/templatemo_header.jpg) no-repeat top center;
 }
 
 #templatemo_header {
@@ -59,7 +59,7 @@ img { margin: 0px; padding: 0px; border: none; }
 	height: 265px;		
 	padding: 0 10px;
 	margin: 0 auto;
-	background: url(images/templatemo_header.jpg) no-repeat top center;
+	background: url(img/templatemo_header.jpg) no-repeat top center;
 }
 
 /* site title */
@@ -160,7 +160,7 @@ img { margin: 0px; padding: 0px; border: none; }
 #formulaire_recherche {
 	position:absolute;
 	top:160px;
-	background: url(images/templatemo_search.png) no-repeat;
+	background: url(img/templatemo_search.png) no-repeat;
 	border:none;
 	margin:0; padding:0;
 }
@@ -192,14 +192,14 @@ img { margin: 0px; padding: 0px; border: none; }
 	width: 920px;
 	margin: 0 auto;
 	padding: 30px 40px;
-	background: url(images/templatemo_content.jpg) repeat-y;
+	background: url(img/templatemo_content.jpg) repeat-y;
 }
 
 #templatemo_content_wrapper_bottom {
 	width: 1000px;
 	height: 15px;
 	margin: 0 auto;
-	background: url(images/templatemo_content_bottom.jpg) no-repeat;
+	background: url(img/templatemo_content_bottom.jpg) no-repeat;
 }
 
 #templatemo_content {
@@ -226,7 +226,7 @@ img { margin: 0px; padding: 0px; border: none; }
 	font-size: 24px;
 	line-height: 1.15em;
 	padding: 20px 0 60px 20px;
-	background: url(images/templatemo_header_bg.png) no-repeat bottom left;
+	background: url(img/templatemo_header_bg.png) no-repeat bottom left;
 }
 
 
@@ -249,7 +249,7 @@ img { margin: 0px; padding: 0px; border: none; }
 	padding: 0;
 	margin: 0;
 	padding: 5px 0 5px 20px;
-	background: url(images/puce.png) left 10px no-repeat;
+	background: url(img/puce.png) left 10px no-repeat;
 	list-style-type:none;
 }
 #templatemo_content #comments,
@@ -306,7 +306,7 @@ img { margin: 0px; padding: 0px; border: none; }
 	font-size: 24px;
 	line-height: 1.15em;
 	padding: 20px 0 60px 20px;
-	background: url(images/templatemo_header_bg.png) no-repeat bottom left;
+	background: url(img/templatemo_header_bg.png) no-repeat bottom left;
 }
 #templatmeo_sidebar .h2 a {
 	color: #3a5909;
@@ -500,7 +500,7 @@ blockquote, blockquote.spip{
   padding: .2em .2em .2em 6em;
   font-style: italic;
   border:none;
-  background: #fff url(images/blockquote.png) no-repeat 4px top;
+  background: #fff url(img/blockquote.png) no-repeat 4px top;
 }
 blockquote p, blockquote.spip p{
   padding: 8px 0;
@@ -601,7 +601,7 @@ span.spip_documents img {background:#E6E0CE; padding:5px;} /* modele img */
 a:link,
 a:hover,a.spip_in, a.spip_out, a.spip_ancre, a.spip_glossaire {color:#0683AB;}
 a:focus {color:white !important; background:#0683AB !important;}
-a.spip_out, a.spip_glossaire {padding-right:14px; background:url(images/out.gif) right no-repeat;}
+a.spip_out, a.spip_glossaire {padding-right:14px; background:url(img/out.gif) right no-repeat;}
 
 /*
 	Pagination
diff --git a/images/image_02.jpg b/img/image_02.jpg
similarity index 100%
rename from images/image_02.jpg
rename to img/image_02.jpg
diff --git a/images/image_03.jpg b/img/image_03.jpg
similarity index 100%
rename from images/image_03.jpg
rename to img/image_03.jpg
diff --git a/images/image_04.jpg b/img/image_04.jpg
similarity index 100%
rename from images/image_04.jpg
rename to img/image_04.jpg
diff --git a/images/image_05.jpg b/img/image_05.jpg
similarity index 100%
rename from images/image_05.jpg
rename to img/image_05.jpg
diff --git a/images/templatemo_list.png b/img/templatemo_list.png
similarity index 100%
rename from images/templatemo_list.png
rename to img/templatemo_list.png
diff --git a/images/templatemo_logo.png b/img/templatemo_logo.png
similarity index 100%
rename from images/templatemo_logo.png
rename to img/templatemo_logo.png
diff --git a/images/templatemo_menu_hover.png b/img/templatemo_menu_hover.png
similarity index 100%
rename from images/templatemo_menu_hover.png
rename to img/templatemo_menu_hover.png
diff --git a/plugin.xml b/plugin.xml
index 5303499..f172478 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -10,6 +10,6 @@
 	<prefix>theme_greeny</prefix>
 	<etat>stable</etat>
 	<necessite id="SPIP" version="[2.0.10;3.0.99]" />
-	<utilise id="Z" version="[1.2.0;]" />
+	<utilise id="Z" version="[2.0.0o;]" />
 	<categorie>theme</categorie>
 </plugin>