diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 3aba87d61..b995ed7cf 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -717,13 +717,13 @@ function set_status_header($code, $text='')
 
 /**
  * set a class to display a counter
- * .zero .one .2nmore 
+ * .zero .one .plural
  */
 function set_span_class($count)
 {
   if ($count > 1) 
   { 
-    return '2nmore';
+    return 'plural';
   }
   return ( $count == 0 ) ? 'zero':'one'; 
 }
diff --git a/template/yoga/default-colors.css b/template/yoga/default-colors.css
index cdcacb953..e88f21208 100644
--- a/template/yoga/default-colors.css
+++ b/template/yoga/default-colors.css
@@ -78,11 +78,11 @@ INPUT.rateButton, INPUT.rateButtonSelected, INPUT.rateButtonStarFull, INPUT.rate
  */
 .infos {
   text-align: left;
-  background-color: palegreen;
+  background-color: #98fb98; /* palegreen */
   background-image: url(icon/admin/infos.png);
   background-repeat: no-repeat;
   background-position: top right;
-  color: darkgreen;
+  color: #006400; /* darkgreen */
   font-weight: bold;
   margin: 5px;
   padding: 10px 50px 10px 10px;
diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css
index b9092d831..712a25f68 100644
--- a/template/yoga/menubar.css
+++ b/template/yoga/menubar.css
@@ -112,9 +112,8 @@ FORM#quickconnect LABEL {
 FORM#quickconnect LABEL {
   margin:0;
   width: 100%;
- /* -moz-box-sizing: padding-box;*/
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
+ -moz-box-sizing: padding-box; /* FIXME in a specific css file for FF */
+  box-sizing: border-box; /* CSS3 */
 }
 
 FORM#quickconnect INPUT[type=text],
diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl
index dd0d9ed00..b13189f9b 100644
--- a/template/yoga/search.tpl
+++ b/template/yoga/search.tpl
@@ -126,8 +126,8 @@
   </ul>
 </fieldset>
 <p>
-  <input class="submit" type="submit" name="submit" value="{lang:submit}" class="bouton" />
-  <input class="submit" type="reset" value="{lang:reset}" class="bouton" />
+  <input class="submit" type="submit" name="submit" value="{lang:submit}" />
+  <input class="submit" type="reset" value="{lang:reset}" />
 </p>
 </form>
 
diff --git a/template/yoga/tags.tpl b/template/yoga/tags.tpl
index 33f69ca69..adff37083 100644
--- a/template/yoga/tags.tpl
+++ b/template/yoga/tags.tpl
@@ -1,4 +1,4 @@
-<!-- $Id: comments.tpl 960 2005-12-03 17:33:38Z chrisaga $ -->
+<!-- $Id$ -->
 <div id="content">
 
   <div class="titrePage">
@@ -12,6 +12,7 @@
     <!-- BEGIN tag -->
     <li><a href="{tag.URL}" class="{tag.CLASS}" title="{tag.TITLE}">{tag.NAME}</a></li>
     <!-- END tag -->
+    <li>&nbsp;</li> <!-- FIXME W3C HTML Conformity said: No empty UL -->
   </ul>
 
 </div> <!-- content -->
diff --git a/template/yoga/theme/clear/theme.css b/template/yoga/theme/clear/theme.css
index f4640473a..c537d6a05 100644
--- a/template/yoga/theme/clear/theme.css
+++ b/template/yoga/theme/clear/theme.css
@@ -53,7 +53,7 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
 #content UL.thumbnails SPAN.wrap2:hover,
 #content UL.thumbnailCategories DIV.thumbnailCategory:hover,
 #content UL.thumbnailCategories DIV.thumbnailCategory:hover A {
-  background-color: AntiqueWhite;
+  background-color: #faebd7;
   border-color: yellow;		/* thumbnails border color when mouse cursor is over it */
   color: black;
 }
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index 982d4f40d..a2d8145b5 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -86,7 +86,7 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
 #content UL.thumbnails SPAN.wrap2:hover,
 #content UL.thumbnailCategories DIV.thumbnailCategory:hover,
 #content UL.thumbnailCategories DIV.thumbnailCategory:hover A {
-  background-color: AntiqueWhite;
+  background-color: #faebd7;
   border-color: yellow;		/* thumbnails border color when mouse cursor is over it */
   color: black;
 }
diff --git a/template/yoga/theme/p0w0/theme.css b/template/yoga/theme/p0w0/theme.css
index 49ae7fca3..2a21f9085 100644
--- a/template/yoga/theme/p0w0/theme.css
+++ b/template/yoga/theme/p0w0/theme.css
@@ -66,7 +66,7 @@ input.rateButtonSelected,
 .browsePath A:hover { color: #fff; }
 #content H2:before, .browsePath:before, .imageNumber:before,
 #imageHeaderBar H2:before {
- content: "« ";
+ content: "__ ";
  font-weight: normal;
  color: #fff;
  font-family: sans-serif;
@@ -74,7 +74,7 @@ input.rateButtonSelected,
 }
 #content H2:after, .browsePath:after, .imageNumber:after,
 #imageHeaderBar H2:after {
- content: " » ";
+ content: " __ ";
  color: #fff;
  font-family: sans-serif;
  font-weight: normal;
@@ -238,13 +238,12 @@ TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid gray;}
 /* Display, Visibility, buttons and others */
 label { cursor:pointer }
 .zero { display: none }
-.one { }
-.2nmore { }
+
 #the_page {
   text-align:center;
   display:block;
 }
-#content H2::after { content: leader(dotted) }
+
 input[type="text"], input[type="password"], input.button,
 input.submit, input.reset, input.file,
 select, textarea {
diff --git a/template/yoga/theme/wipi/theme.css b/template/yoga/theme/wipi/theme.css
index 2150a5b35..62274a8f0 100644
--- a/template/yoga/theme/wipi/theme.css
+++ b/template/yoga/theme/wipi/theme.css
@@ -196,7 +196,7 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
 #content UL.thumbnails SPAN.wrap2:hover,
 #content UL.thumbnailCategories DIV.thumbnailCategory:hover,
 #content UL.thumbnailCategories DIV.thumbnailCategory:hover A {
-  background-color: #f92;
+  background-color: #dfe8ff;
   border-color: #69c;		/* thumbnails border color when mouse cursor is over it */
   color: black;
 }
diff --git a/template/yoga/upload.tpl b/template/yoga/upload.tpl
index 6fb30d208..6b0cde615 100644
--- a/template/yoga/upload.tpl
+++ b/template/yoga/upload.tpl
@@ -84,7 +84,7 @@
     <!-- END fields -->
     <tr>
       <td colspan="2" align="center">
-      <input class="submit" name="submit" type="submit" value="{lang:submit}" class="bouton" />
+      <input class="submit" name="submit" type="submit" value="{lang:submit}" />
       </td>
     </tr>
     </table>