diff --git a/include/page_header.php b/include/page_header.php
index 4ebe643b2..3946d2c02 100644
--- a/include/page_header.php
+++ b/include/page_header.php
@@ -100,4 +100,6 @@ trigger_action('loc_end_page_header');
 
 header('Content-Type: text/html; charset='.$lang_info['charset']);
 $template->parse('header');
+
+trigger_action('loc_after_page_header');
 ?>
diff --git a/template/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
index 94642f873..f34618118 100644
--- a/template/yoga/admin/cat_list.tpl
+++ b/template/yoga/admin/cat_list.tpl
@@ -15,6 +15,10 @@
 
 <!-- BEGIN categories -->
 <form id="categoryOrdering" action="{F_ACTION}" method="post">
+  <p>
+    <input name="submitOrder" type="submit" value="{lang:Save order}" {TAG_INPUT_ENABLED} />
+    <input name="submitOrderAlphaNum" type="submit" value="{lang:Order alphanumerically}" {TAG_INPUT_ENABLED} />
+  </p>
   <ul class="categoryUl">
 
     <!-- BEGIN category -->
diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css
index 4e0b1e94a..b9092d831 100644
--- a/template/yoga/menubar.css
+++ b/template/yoga/menubar.css
@@ -134,8 +134,9 @@ FORM#quicksearch {
   margin-bottom: 1px;
 }
 input#qsearchInput { 
-  width: 90%; 
+  width: 90%;
 }
+#menubar #mbMenu p { margin: 0px; padding: 0px; }
 
 #menubar #menuTagCloud {
   text-align: center;
diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index 7d3f018af..2b8141724 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -69,7 +69,11 @@
   <dd>
       <!-- 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>
+      <form action="{pwg_root}qsearch.php" method="get" id="quicksearch">
+      <p>
+      <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" />
+      </p>
+      </form>
       <script type="text/javascript">var qsearch_prompt="{lang:search}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
       <!-- END quick_search -->
       <!-- END summary -->
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index 52d64cd9c..c92d0e8d6 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -192,7 +192,7 @@
       <!-- END author_field -->
       <label>{lang:comment}<textarea name="content" rows="5" cols="80">{comments.add_comment.CONTENT}</textarea></label>
       <input type="hidden" name="key" value="{comments.add_comment.KEY}" />
-      <input type="submit" value="{lang:submit}">
+      <input type="submit" class="submit" value="{lang:submit}">
     </fieldset>
   </form>
   <!-- END add_comment -->
diff --git a/template/yoga/theme/p0w0/images/index.php b/template/yoga/theme/p0w0/images/index.php
deleted file mode 100644
index ad16c4524..000000000
--- a/template/yoga/theme/p0w0/images/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
-// | last update   : $Date: 2006-03-15 23:44:35 +0100 (mer., 15 mars 2006) $
-// | last modifier : $Author: plg $
-// | revision      : $Revision: 1082 $
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// recursive call of index.php
-
-$url = '../index.php';
-header( 'Request-URI: '.$url );
-header( 'Content-Location: '.$url );
-header( 'Location: '.$url );
-exit();
-?>
diff --git a/template/yoga/theme/p0w0/images/tableh1_bg.png b/template/yoga/theme/p0w0/images/tableh1_bg.png
deleted file mode 100644
index 14d15fa36..000000000
Binary files a/template/yoga/theme/p0w0/images/tableh1_bg.png and /dev/null differ
diff --git a/template/yoga/theme/p0w0/images/tableh2_bg.png b/template/yoga/theme/p0w0/images/tableh2_bg.png
deleted file mode 100644
index 1465b5330..000000000
Binary files a/template/yoga/theme/p0w0/images/tableh2_bg.png and /dev/null differ
diff --git a/template/yoga/theme/p0w0/theme.css b/template/yoga/theme/p0w0/theme.css
index d5bb1b74d..5edf2059b 100644
--- a/template/yoga/theme/p0w0/theme.css
+++ b/template/yoga/theme/p0w0/theme.css
@@ -1,265 +1,250 @@
-/* $Id: theme.css 1677 2006-12-21 21:38:20Z rub $ */
-
-/* text color */
-BODY, H1, H3, DT,
-INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
-  color:#69c;
-}
-#menubar { 
-  margin : 0px;
-  background-color: transparent;
-  border: 0px;
-}
-H2, .throw {
-  color: #69c;
-}
-#menubar DT, #menubar DT A {
-  color: #69c; 
-  font-weight: lighter;
-}
-#menubar DT A:hover {
-  color: #f92; 
-  font-weight: lighter;
-}
-#menubar .selected  A {
-  color: #69c; 
-}
-#menubar .selected  A:hover {
-  color: #f92; 
-}
-#menubar DT:before {
- content: "__\\_ "; 
- color: #f92; 
-}
-#menubar DT:after {
- content: " _/__"; 
- color: #69c;
-}
-#theAdminPage #menubar DT:before,
-#theAdminPage #menubar DT:after {
- content: ''; 
-}
-#content .navigationBar {
-  color: #666;
-}
-#content .pageNumberSelected {
-  color: #f92;
-}
-#content .infos {
-  background-color: #69c;
-  color: #036;
-}
-#content .errors {
-  background-color: #fc5;
-  border-color: #f92;
-  color: #900;
-}
-/* backgrounds */
-
-
-BODY {
-  background: #ddd;
-  margin: 0px;
-  padding: 0px;
-}
-H3, #imageHeaderBar, #imageToolBar A:hover, .row1  {
-  background-color: #fff;
-} 
-
-#theAdminPage #the_page {
-  background-color: #fff;
-}
-#imageToolBar, .header_notes {
-  background-color: #fff;
-}
-A {
-  border-color: #69c;
-}
-A:hover {
-  border-color: #f92;
-}
-
-#content, DIV.content { 
-      /* All div similar to #content can be classified as content */
-
-  background-color: #eee; 
-  border: 1px solid #69c;
-  padding: 5px;
-}
-H2, #menubar DT, .throw, TD H3, #theAdminPage H3 {
-  background-image: url(images/tableh1_bg.png);
-}
-#content H2 {
-  background: none;
-  border: 0px;
-  letter-spacing: -0.05em; 
-  text-indent: 1em;
-  text-transform:	uppercase;
-  font-weight: normal;
-  margin-bottom: 20px;
-}
-#content H3 {
-  text-indent: 3em
-}
-.browsePath A {
-  color: #999;
-}
-#content H2:before, .browsePath:before, .imageNumber:before,
-#imageHeaderBar H2:before {
- content: "____\\_ "; 
- color: #f92; 
- font-family: Times, Zapf-Chancery, Cottonwood, Helvetica;
- letter-spacing: 0em; 
-}
-#content H2:after, .browsePath:after, .imageNumber:after,
-#imageHeaderBar H2:after {
- content: " _/____"; 
- color: #69c;
- font-family: Times, Zapf-Chancery, Cottonwood, Helvetica;
- letter-spacing: 0em; 
-}
-#imageHeaderBar H2 {
-  background-image: none;
-  background-color: transparent;
-  border: none;
-}
-#thePicturePage #the_page {
-  background-color: #fff;
-}
-#thePicturePage #imageHeaderBar {
-  background-image: url(images/tableh2_bg.png); 
-  background-repeat: repeat-x;
-}
-#thePicturePage #imageToolBar {
-  background-color: #fff;
-  border-bottom: 2px solid #f92;
-}
-#thePicturePage #theImage {
-  background-color: #fff;
-  margin: 0px;
-  padding: 3px 0px 15px 0px;
-}
-
-#thePicturePage #comments H2 {
-  background-image: none;
-  background-color: #ddd;
-  border-top: 2px solid #f92;
-  border-bottom: 2px solid #f92;
-  color: #f92; 
-  font-weight: lighter;
-}
-
-/* borders */
-#comments DIV.comment BLOCKQUOTE {
-  border: 1px solid #fff;
-}
-#imageHeaderBar {
-  border-top: 1px solid #fff;
-}
-H2, #imageToolBar {
-  border-bottom: 1px solid #fff;
-}
-
-#theImage IMG {
-  border-color: #111;
-}
-
-#content UL.thumbnail IMG {
-  border: 1px solid #666;
-}
-.illustration A {
-  border: 0px;
-}
-FIELDSET, INPUT, SELECT, TEXTAREA,
-#content DIV.comment  A.illustration IMG, #infos,
-#content DIV.thumbnailCategory {
-  border: 1px solid gray;
-}
-#content DIV.thumbnailCategory {
-  border: 1px solid #69c;
-  margin: 8px 4px;
-}
-#content DIV.thumbnailCategory:hover {
-  border: 1px solid #f92;
-  background-color: #fff;
-}
-#comments DIV.comment BLOCKQUOTE {
-  border-left: 2px solid #969696;
-}
-
-#content UL.thumbnails SPAN.wrap2 {
-  border: 1px solid #69c;	/* thumbnails border color and style */
-  -moz-border-radius: 4px;	/* round corners with Geko */
-  border-radius: 4px 4px;	/* round corners with CSS3 compliant browsers */
-}
-#content UL.thumbnails SPAN.wrap2:hover {
-  border-color: #f92;		/* thumbnails border color when mouse cursor is over it */
-  background-color: #fff;
-}
-#menubar .buttonmenu {
-  margin: 0 2px;
-  width: auto;
-  padding: 0;
-  text-indent: 0;
-  list-style: none;
-  text-align: center;
-  float: left;
-}
-/* links */
-A, INPUT.rateButton, legend {
-  color: #69c;
-}
-
-A:hover {
-  color: #f92;
-}
-
-#imageToolBar A, #imageToolBar A:hover {
-  border-bottom: none;
-}
-A.navThumb, A.navThumb:hover {
-  border-bottom: none;
-}
-/* others */
-.pleaseNote {
-  background: #9c9c9c;
-  color: #ffff99;
-  padding: 1ex;
-  font-weight: bold;
-}
-#the_page {
-  border: 1px dotted #69c;
-  padding-top: 5px;
-  padding-bottom:30px;
-  text-align:center;
-  display:block;
-  margin: 2px;
-}
-#copyright {
-  color: #69c;
-}
-/*calendar elements*/
-SPAN.calItemEmpty { color: silver; }
-
-SPAN.calItem, SPAN.calItemEmpty
-{
-  border: 1px solid gray;
-}
-label {
-	cursor:pointer
-}
-input#qsearchInput { 
-  color: #36f; background-color: #cef; 
-}
-.zero { display: none }
-.one { }
-.2nmore { }
-
-/* nice looking month calendar*/
-TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid gray;}
-
-TD.calDayCellEmpty { color: silver; }
-
-.calBackDate { color: #000; }
-.calForeDate { color: #fff; }
-.virtual_cat { background: #fff !important; }
+/* $Id: theme.css 1677 2006-12-21 21:38:20Z rub $ */
+
+/**
+ * Color scheme (Remember #6699cc = #69c)
+ * #000000 #336699 #4477aa #6699cc (Black -> Blues)
+ * #cc6600 #ff9933 (Oranges)
+ * #cccccc
+ * #ccddee #dfe8ff #eeeeff #ffffff (Light colors -> White)
+ * */  
+/**
+ * Logic
+ * - Texts
+ * - Backgrounds
+ * - Borders, Margins, Padding
+ * - Visibility / Display
+ */
+
+/******************************************************************************/
+/* Texts Only */
+BODY, H1, H3, DT, H2, .throw, 
+#copyright,
+#menubar .selected  A { color: #69c; }
+H2, #menubar DT, .throw, TD H3, #theAdminPage H3, .calForeDate {
+  color: #fff;
+}
+#menubar DT, #menubar DT A {
+  color: #fff;
+  font-weight: bold;
+}
+#content .titrePage .categoryActions li { color: #cde;}
+#menubar DT A:hover {
+  color: #f92;
+  font-weight: bold;
+}
+#menubar .selected  A:hover,
+#content .pageNumberSelected,
+A, INPUT.rateButton, legend { color: #369; }
+A:hover { color: #f92; }
+INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
+  color:#69c;
+}
+.infoTable,
+#theAdminPage #content,
+#content .navigationBar,
+input#qsearchInput { color: #369; }
+#content .infos { color: #036; }
+#content .errors { color: #900; }
+#content .titrePage H2 A { color: #dfe8ff; }
+input.rateButtonSelected,
+#content .titrePage H2 A:hover { color: #f92; }
+#content H2 {
+  letter-spacing: 0.01em;
+  text-indent: 1em;
+  font-weight: normal;
+}
+#content H3 {
+  text-indent: 3em
+}
+.browsePath, .imageNumber,
+#imageHeaderBar H2,
+.browsePath A {
+  color: #eef;
+  font-weight: bold;
+}
+.browsePath A:hover { color: #fff; }
+#content H2:before, .browsePath:before, .imageNumber:before,
+#imageHeaderBar H2:before {
+ content: "____ ";
+ font-weight: normal;
+ color: #fff;
+ font-family: sans-serif;
+ letter-spacing: 0em;
+}
+#content H2:after, .browsePath:after, .imageNumber:after,
+#imageHeaderBar H2:after {
+ content: " ____";
+ color: #fff;
+ font-family: sans-serif;
+ font-weight: normal;
+ letter-spacing: 0em;
+}
+#thePicturePage #comments H2 {
+  color: #69c;
+}
+#content ul.thumbnailCategories li div.thumbnailCategory .description p + p {
+  color: #369;
+}
+#theAdminPage h3 a,
+#content div.thumbnailCategory .description h3 a {
+  color: #fff;
+}
+#content div.thumbnailCategory .description h3 a:hover {
+  color: #f92;
+}
+.pleaseNote {
+  color: #ff9;
+  font-weight: bold;
+}
+TD.calDayCellEmpty,
+SPAN.calItemEmpty { color: silver; }
+.calBackDate { color: #000; }
+input[type="reset"],
+input[type="submit"] {
+  color: #fff;
+  font-weight: bold;
+}
+
+/******************************************************************************/
+/* Backgrounds Only */
+BODY { background: #cde; }
+.header_notes,
+#thePicturePage #the_page,
+#thePicturePage #theImage,
+#theAdminPage #the_page,
+#content, DIV.content { background-color: #dfe8ff; }
+#menubar, H3, #imageHeaderBar,
+.row1  { background-color: #eef; }
+H2, #menubar DT, .throw, TD H3,
+#imageToolBar,
+#imageHeaderBar, #imageHeaderBar H2,
+#theAdminPage H3 { background-color: #369; }
+#content H2 { background-color: #369; }
+#content .infos { background-color: #47a; }
+#content .errors { background-color: #fc5; }
+#thePicturePage #comments H2 {
+  background-color: #eef;
+}
+#content ul.thumbnailCategories li div.thumbnailCategory .description h3 {
+  background-color: #69c;
+}
+#content ul.thumbnailCategories li div.thumbnailCategory,
+#content UL.thumbnails SPAN.wrap2 { background-color: #eef; }
+#content ul.thumbnailCategories li div.thumbnailCategory:hover,
+#theImage IMG, .navThumb IMG,
+#content UL.thumbnails SPAN.wrap2:hover { background-color: #fff; }
+.pleaseNote {
+  background: #69c;
+}
+input#qsearchInput { background-color: #cde; }
+.virtual_cat { background: #fff !important; }
+input[type="reset"],
+input[type="submit"] {
+  background-color: #369;
+}
+/******************************************************************************/
+/* Borders, Margins, Padding Only */
+BODY { margin: 0px;  padding: 0px; }
+#menubar {
+  margin : 0px 0px 0px 8px;
+  border: 0px;
+  text-decoration: none;
+  border: 1px solid #369;
+}
+A { border: 0px; text-decoration: none; }
+A:hover { text-decoration: none; border: 0px; }
+#content, DIV.content {
+  border: 1px solid #369;
+  padding: 0px;
+}
+#content H2 {
+  border: 0px;
+  margin-bottom: 20px;
+}
+#content .errors { border-color: #f92; }
+#imageHeaderBar H2 { border: 0px; }
+#thePicturePage #imageToolBar { padding: 0px 25px 5px 25px; }
+#thePicturePage #theImage {
+  margin: 0px;
+  padding: 3px 0px 15px 0px;
+}
+#thePicturePage #comments H2 {
+  border-top: 2px solid #69c;
+  border-bottom: 1px solid #369;
+}
+#comments DIV.comment BLOCKQUOTE {
+  border: 1px solid #fff;
+}
+H2, #imageToolBar {
+  border-bottom: 1px solid #fff;
+}
+.navThumb IMG { border: 1px solid #369; padding: 1px }
+#theImage IMG { border: 3px solid #369; margin: 2px auto; padding: 1px }
+#content UL.thumbnail IMG {
+  border: 1px solid #666;
+}
+.illustration A {
+  border: 0px;
+}
+FIELDSET, INPUT, SELECT, TEXTAREA,
+#content DIV.comment  A.illustration IMG, #infos,
+#content DIV.thumbnailCategory {
+  border: 1px solid #69c;
+  background-color: #dfe8ff;
+  margin: 3px;
+}
+#content DIV.thumbnailCategory:hover {
+  border: 1px solid #f92;
+}
+#content UL.thumbnails SPAN.wrap2 {
+  border: 1px solid #69c;	/* thumbnails border color and style */
+  -moz-border-radius: 4px;	/* round corners with Geko */
+  border-radius: 4px 4px;	/* round corners with CSS3 compliant browsers */
+}
+#content UL.thumbnails SPAN.wrap2:hover {
+  border-color: #f92;		/* thumbnails border color when mouse cursor is over it */
+}
+A.navThumb, A.navThumb:hover,
+#imageToolBar A, #imageToolBar A:hover {
+  border-bottom: none;
+}
+#the_page {
+  border: 0px;
+  padding: 5px 0px 30px 0px;
+  margin: 0px;
+}
+.pleaseNote {
+  padding: 1ex;
+}
+SPAN.calItem, SPAN.calItemEmpty { border: 1px solid gray; }
+TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid gray;}
+input[type="reset"],
+input[type="submit"] {
+  border: 1px solid #eef;
+  padding: 5px 5px;
+}
+#addComment input[name="submit"] { padding: 5px 30px; }
+#theAdminPage #content table td { padding: 2px 8px; }
+input[type="text"], input[type="password"], input.button,
+input.submit, input.reset, input.file,
+select, textarea {
+  color: #369;
+  border: 1px solid #369;
+  background-color: #eeeeff;
+}
+
+input:focus, select:focus, textarea:focus /*, INPUT.focus, FORM .focus*/ {
+  background-color: #fff;	
+}
+
+/******************************************************************************/
+/* Display, Visibility and others */
+label { cursor:pointer }
+.zero { display: none }
+.one { }
+.2nmore { }
+#the_page {
+  text-align:center;
+  display:block;
+}
+#content H2::after { content: leader(dotted) }
diff --git a/template/yoga/theme/p0w0/themeconf.inc.php b/template/yoga/theme/p0w0/themeconf.inc.php
index 3fb9ad84b..f29bab129 100644
--- a/template/yoga/theme/p0w0/themeconf.inc.php
+++ b/template/yoga/theme/p0w0/themeconf.inc.php
@@ -1,11 +1,11 @@
-<?php
-$themeconf = array(
-  'template' => 'yoga',
-  'theme' => 'p0w0',
-  'template_dir' => 'template/yoga',
-  'icon_dir' => 'template/yoga/icon',
-  'admin_icon_dir' => 'template/yoga/icon/admin',
-  'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
-  'local_head' => '<!-- no theme specific head content -->'
-);
-?>
+<?php
+$themeconf = array(
+  'template' => 'yoga',
+  'theme' => 'p0w0',
+  'template_dir' => 'template/yoga',
+  'icon_dir' => 'template/yoga/icon',
+  'admin_icon_dir' => 'template/yoga/icon/admin',
+  'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
+  'local_head' => '<!-- no theme specific head content -->'
+);
+?>