diff --git a/template/yoga/mainpage_categories.tpl b/template/yoga/mainpage_categories.tpl
index 8c00b433e..ab61b52e3 100644
--- a/template/yoga/mainpage_categories.tpl
+++ b/template/yoga/mainpage_categories.tpl
@@ -17,7 +17,7 @@
           {categories.category.ICON}
         </h3>
         <p>{categories.category.CAPTION_NB_IMAGES}</p>
-        <p>{categories.category.DESCRIPTION}</p>
+        <p>{categories.category.DESCRIPTION}&nbsp;</p> <!-- &nbsp; to avoid a HTML warning -->
       </div>
     </div>
   </li>
diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css
index 814f19a73..3400a997b 100644
--- a/template/yoga/menubar.css
+++ b/template/yoga/menubar.css
@@ -12,14 +12,14 @@
     margin: 0; padding: 0; display: block;
 }
 
-#menubar .buttonmenu {
+#menubar .button {
   margin: 0 2px;
   width: auto;
   padding: 0;
   text-indent: 0;
   list-style: none;
   text-align: center;
-  float: right;
+  float: left;
 }
 
 /* H2 properties copied here */
@@ -133,6 +133,9 @@ FORM#quicksearch {
   margin-top: 4px;
   margin-bottom: 1px;
 }
+input#qsearchInput { 
+  width: 90%; 
+}
 
 #menubar #menuTagCloud {
   text-align: center;
diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index 85b77cefe..7d3f018af 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -22,13 +22,13 @@
   </dd>
 </dl>
 <!-- END links -->
-<dl id="mbCategories">
   <!-- BEGIN start_filter -->
-  <a href="{start_filter.URL}" title="{lang:start_filter_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/start_filter.png" class="buttonmenu" alt="{lang:start_filter_hint}"></a>
+  <a href="{start_filter.URL}" title="{lang:start_filter_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/start_filter.png" class="button" alt="{lang:start_filter_hint}"></a>
   <!-- END start_filter -->
   <!-- BEGIN stop_filter -->
-  <a href="{stop_filter.URL}" title="{lang:stop_filter_hint}"><img src="{pwg_root}{themeconf:icon_dir}/stop_filter.png" class="buttonmenu" alt="{lang:stop_filter_hint}"></a>
+  <a href="{stop_filter.URL}" title="{lang:stop_filter_hint}"><img src="{pwg_root}{themeconf:icon_dir}/stop_filter.png" class="button" alt="{lang:stop_filter_hint}"></a>
   <!-- END stop_filter -->
+<dl id="mbCategories">
   <dt><a href="{U_HOME}">{lang:Categories}</a></dt>
   <dd>
     {MENU_CATEGORIES_CONTENT}
@@ -67,12 +67,14 @@
 <dl id="mbMenu">
   <dt>{lang:title_menu}</dt>
   <dd>
-    <ul>
       <!-- BEGIN summary -->
       <!-- BEGIN quick_search -->
       <form action="{pwg_root}qsearch.php" method="get" id="quicksearch"><input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;"></form>
       <script type="text/javascript">var qsearch_prompt="{lang:search}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
       <!-- END quick_search -->
+      <!-- END summary -->
+    <ul>
+      <!-- BEGIN summary -->
       <li><a href="{summary.U_SUMMARY}" title="{summary.TITLE}" {summary.REL}>{summary.NAME}</a></li>
       <!-- END summary -->
       <!-- BEGIN upload -->
diff --git a/template/yoga/theme/p0w0/theme.css b/template/yoga/theme/p0w0/theme.css
index e87174ba1..d5bb1b74d 100644
--- a/template/yoga/theme/p0w0/theme.css
+++ b/template/yoga/theme/p0w0/theme.css
@@ -248,7 +248,9 @@ SPAN.calItem, SPAN.calItemEmpty
 label {
 	cursor:pointer
 }
-
+input#qsearchInput { 
+  color: #36f; background-color: #cef; 
+}
 .zero { display: none }
 .one { }
 .2nmore { }
diff --git a/template/yoga/theme/wipi/theme.css b/template/yoga/theme/wipi/theme.css
index e28625b12..5da064762 100644
--- a/template/yoga/theme/wipi/theme.css
+++ b/template/yoga/theme/wipi/theme.css
@@ -18,7 +18,7 @@ H2, .throw {
   font-weight: lighter;
 }
 #menubar DT A:hover {
-  color: #111; 
+  color: #69c; 
   font-weight: lighter;
 }
 #menubar .selected  A {
@@ -185,6 +185,7 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
 }
 #content UL.thumbnails SPAN.wrap2:hover {
   border-color: #69c;		/* thumbnails border color when mouse cursor is over it */
+  background-color: #080808;
 }
 #menubar .buttonmenu {
   margin: 0 2px;
@@ -238,10 +239,37 @@ SPAN.calItem, SPAN.calItemEmpty
 label {
 	cursor:pointer
 }
-
+input#qsearchInput { 
+  color: #58c; 
+  background-color: #222;  
+  border: 1px solid #333;
+  padding: 1px 3px;
+}
 .zero { display: none }
-.one { }
-.2nmore { }
+.one { background: transparent; }
+.2nmore { background: transparent; }
+.nb-hits { color: #69c; }
+.nb-comments { color: #f92; }
+
+FORM#quickconnect,
+FORM#quickconnect FIELDSET,
+FORM#quickconnect P,
+FORM#quickconnect UL.actions,
+FORM#quickconnect FIELDSET>UL.actions,
+FORM#quickconnect UL.actions,
+FORM#quickconnect P,
+FORM#quickconnect LABEL {
+  color: #69c;   
+}
+FORM#quickconnect P INPUT,
+FORM#quickconnect INPUT[type=text],
+FORM#quickconnect INPUT[type=password] {
+  width: 85%;
+  color: #58c;   
+  background-color: #222;  
+  border: 1px solid #333;
+  padding: 1px 3px;
+}
 
 /* nice looking month calendar*/
 TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid gray;}