377 files changed, 61 insertions, 345 deletions

diff --git a/template/default/include/autosize.inc.tpl b/admin/themes/default/template/include/autosize.inc.tpl
index 5529d07bd..8f5c78c70 100644
--- a/template/default/include/autosize.inc.tpl
+++ b/admin/themes/default/template/include/autosize.inc.tpl
@@ -1,5 +1,5 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.autogrow" src=$ROOT_URL|@cat:"template-common/lib/plugins/jquery.autogrow-textarea.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.autogrow" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.autogrow-textarea.js"}
 
 {* Auto size and auto grow textarea *}
 {literal}
diff --git a/template/default/include/resize.inc.tpl b/admin/themes/default/template/include/resize.inc.tpl
index aebb9f6c5..30a637563 100644
--- a/template/default/include/resize.inc.tpl
+++ b/admin/themes/default/template/include/resize.inc.tpl
@@ -1,6 +1,6 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.resizable.packed.js"}
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
+{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.resizable.packed.js"}
 
 {* Resize possible *}
 {literal}
diff --git a/template-common/csshover.htc b/template-common/csshover.htc
deleted file mode 100644
index 14f88576c..000000000
--- a/template-common/csshover.htc
+++ /dev/null
@@ -1,120 +0,0 @@
-<attach event="ondocumentready" handler="parseStylesheets" />
-<script>
-/**
- *	Whatever:hover - V1.42.060206 - hover & active
- *	------------------------------------------------------------
- *	(c) 2005 - Peter Nederlof
- *	Peterned - http://www.xs4all.nl/~peterned/
- *	License  - http://creativecommons.org/licenses/LGPL/2.1/
- *
- *	Whatever:hover is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU Lesser General Public
- *	License as published by the Free Software Foundation; either
- *	version 2.1 of the License, or (at your option) any later version.
- *
- *	Whatever:hover 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
- *	Lesser General Public License for more details.
- *
- *	Credits and thanks to:
- *	Arnoud Berendsen, Martin Reurings, Robert Hanson
- *
- *	howto: body { behavior:url("csshover.htc"); }
- *	------------------------------------------------------------
- */
-
-var csshoverReg = /(^|\s)(([^a]([^ ]+)?)|(a([^#.][^ ]+)+)):(hover|active)/i,
-currentSheet, doc = window.document, hoverEvents = [], activators = {
-	onhover:{on:'onmouseover', off:'onmouseout'},
-	onactive:{on:'onmousedown', off:'onmouseup'}
-}
-
-function parseStylesheets() {
-	if(!/MSIE (5|6)/.test(navigator.userAgent)) return;
-	window.attachEvent('onunload', unhookHoverEvents);
-	var sheets = doc.styleSheets, l = sheets.length;
-	for(var i=0; i<l; i++) 
-		parseStylesheet(sheets[i]);
-}
-	function parseStylesheet(sheet) {
-		if(sheet.imports) {
-			try {
-				var imports = sheet.imports, l = imports.length;
-				for(var i=0; i<l; i++) parseStylesheet(sheet.imports[i]);
-			} catch(securityException){}
-		}
-
-		try {
-			var rules = (currentSheet = sheet).rules, l = rules.length;
-			for(var j=0; j<l; j++) parseCSSRule(rules[j]);
-		} catch(securityException){}
-	}
-
-	function parseCSSRule(rule) {
-		var select = rule.selectorText, style = rule.style.cssText;
-		if(!csshoverReg.test(select) || !style) return;
-
-		var pseudo = select.replace(/[^:]+:([a-z-]+).*/i, 'on$1');
-		var newSelect = select.replace(/(\.([a-z0-9_-]+):[a-z]+)|(:[a-z]+)/gi, '.$2' + pseudo);
-		var className = (/\.([a-z0-9_-]*on(hover|active))/i).exec(newSelect)[1];
-		var affected = select.replace(/:(hover|active).*$/, '');
-		var elements = getElementsBySelect(affected);
-		if(elements.length == 0) return;
-
-		currentSheet.addRule(newSelect, style);
-		for(var i=0; i<elements.length; i++)
-			new HoverElement(elements[i], className, activators[pseudo]);
-	}
-
-function HoverElement(node, className, events) {
-	if(!node.hovers) node.hovers = {};
-	if(node.hovers[className]) return;
-	node.hovers[className] = true;
-	hookHoverEvent(node, events.on, function() { node.className += ' ' + className; });
-	hookHoverEvent(node, events.off, function() { node.className = node.className.replace(new RegExp('\\s+'+className, 'g'),''); });
-}
-	function hookHoverEvent(node, type, handler) {
-		node.attachEvent(type, handler);
-		hoverEvents[hoverEvents.length] = { 
-			node:node, type:type, handler:handler 
-		};
-	}
-
-	function unhookHoverEvents() {
-		for(var e,i=0; i<hoverEvents.length; i++) {
-			e = hoverEvents[i]; 
-			e.node.detachEvent(e.type, e.handler);
-		}
-	}
-
-function getElementsBySelect(rule) {
-	var parts, nodes = [doc];
-	parts = rule.split(' ');
-	for(var i=0; i<parts.length; i++) {
-		nodes = getSelectedNodes(parts[i], nodes);
-	}	return nodes;
-}
-	function getSelectedNodes(select, elements) {
-		var result, node, nodes = [];
-		var identify = (/\#([a-z0-9_-]+)/i).exec(select);
-		if(identify) {
-			var element = doc.getElementById(identify[1]);
-			return element? [element]:nodes;
-		}
-		
-		var classname = (/\.([a-z0-9_-]+)/i).exec(select);
-		var tagName = select.replace(/(\.|\#|\:)[a-z0-9_-]+/i, '');
-		var classReg = classname? new RegExp('\\b' + classname[1] + '\\b'):false;
-		for(var i=0; i<elements.length; i++) {
-			result = tagName? elements[i].all.tags(tagName):elements[i].all; 
-			for(var j=0; j<result.length; j++) {
-				node = result[j];
-				if(classReg && !classReg.test(node.className)) continue;
-				nodes[nodes.length] = node;
-			}
-		}	
-		
-		return nodes;
-	}
-</script>
\ No newline at end of file
diff --git a/template-common/default-layout.css b/template-common/default-layout.css
deleted file mode 100644
index a1eaa1ef6..000000000
--- a/template-common/default-layout.css
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/* Set the width of the menubar for the galery */
-#menubar {
-  width: 18em;
-}
-.content {
-  margin-left: 20em;  /* = #menubar width + 2em */
-}
-/* Set minimum width of the page before getting a scrollbar */
-/* IE5 and IE6 don't get that */
-BODY {
-  min-width: 60em;  /* ~ 3* #menubar width */
-}
-BODY#thePopuphelpPage {
-  min-width: 0;
-}
-
-/* Set some sizes according to your maximum thumbnail width and height */
-.content UL.thumbnails SPAN,
-.content UL.thumbnails SPAN.wrap2 A,
-.content UL.thumbnails LABEL,
-.content DIV.thumbnailCategory DIV.illustration {
-  width: 140px;      /* max thumbnail width + 2px */
-}
-.content UL.thumbnails SPAN.wrap2,
-.content DIV.thumbnailCategory DIV.description {
-  height: 140px;    /* max thumbnail height + 2px */
-}
-
-
-/* Category thumbnails on main page */
-.content UL.thumbnailCategories LI {
-  width: 49.7%;    /* 49.7% for 2 per line, 33.2% for 3 per line*/
-}
-
-/* Set defaults for thumbnails legend */
-.content UL.thumbnails SPAN.thumbLegend {
-  display: block;  /* display: none; if you don't want legend */
-  height: 4em;    /* legend height (don't set auto to be Gecko friendly)*/
-}
-
diff --git a/template-common/inputfix.htc b/template-common/inputfix.htc
deleted file mode 100644
index e99d2b2c7..000000000
--- a/template-common/inputfix.htc
+++ /dev/null
@@ -1,42 +0,0 @@
-<public:attach event="oncontentready"  onevent="fixElements()" />
-
-<script langage=javascript>
-
-function setFocusStyle()
-{
-  window.event.srcElement.className += ' focus';
-}
-
-function setBlurStyle()
-{
-  window.event.srcElement.className = window.event.srcElement.className.replace( ' focus', ' nofocus');
-}
-
-function setClassFromType()
-{
-  this.className += ' ' + this.type;
-}
-
-function fixElements()
-{
-  for ( var i=0; i<this.elements.length; i++ )
-  {
-    var elem=this.elements[i];
-    switch ( elem.tagName )
-    {
-      case "INPUT":
-        elem.className += ' ' + elem.type;
-        if ( (elem.type != "radio") && (elem.type != "checkbox") )
-        { /* setting focus/nofocus on those is a mess to handle in css */
-          elem.attachEvent( 'onfocus', setFocusStyle );
-          elem.attachEvent( 'onblur', setBlurStyle );
-        }
-      break;
-      case "SELECT":
-      case "TEXTAREA":
-        elem.attachEvent( 'onfocus', setFocusStyle );
-        elem.attachEvent( 'onblur', setBlurStyle );
-    }
-  }
-}
-</script>
diff --git a/template-common/tooltipfix.htc b/template-common/tooltipfix.htc
deleted file mode 100644
index 4ce943af1..000000000
--- a/template-common/tooltipfix.htc
+++ /dev/null
@@ -1,31 +0,0 @@
-<public:attach event="onmouseover" onevent="montrer()" />
-<public:attach event="onmouseout"  onevent="cacher()" />
-
-<script langage=javascript>
-var thisImg = this;
-var thisTitle = this.title;
-var thisAlt = this.alt;
-var thisA = this.parentNode;
-var aTitle = thisA.title;
-
-function montrer()
-{
-  if (aTitle)
-  {
-    thisAlt=thisImg.alt;
-    thisImg.alt=aTitle;
-    thisImg.title=aTitle;
-  }
-  return;
-}
-
-function cacher() {
-  if (thisAlt)
-  {
-    thisImg.alt=thisAlt;
-    thisImg.title=thisTitle;
-  }
-  return;
-}
-</script>
-
diff --git a/template/default/include/datepicker.inc.tpl b/template/default/include/datepicker.inc.tpl
deleted file mode 100644
index cd502e91e..000000000
--- a/template/default/include/datepicker.inc.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-
-{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.datepicker" src=$ROOT_URL|@cat:"template-common/lib/ui/packed/ui.datepicker.packed.js"}
-{known_script id="datepicker.js" src=$ROOT_URL|@cat:"template-common/datepicker.js"}
-
-{assign var="datepicker_language" value="template-common/lib/ui/i18n/ui.datepicker-"|@cat:$lang_info.code|@cat:".js"}
-
-{if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
-{known_script id="jquery.ui.datepicker-$lang_info.code" src=$ROOT_URL|@cat:$datepicker_language}
-{/if}
-
-{html_head}
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template-common/lib/ui/theme/ui.datepicker.css">
-{/html_head}
-
-<script type="text/javascript">
-function pwg_initialization_datepicker(day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date)
-{ldelim}
-  return pwg_common_initialization_datepicker(
-    "{$ROOT_URL}{$themeconf.icon_dir}/datepicker.png",
-    day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date);
-}
-</script>
diff --git a/template/yoga/theme/Sylvia/themeconf.inc.php b/template/yoga/theme/Sylvia/themeconf.inc.php
deleted file mode 100644
index 3c99c66cd..000000000
--- a/template/yoga/theme/Sylvia/themeconf.inc.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$themeconf = array(
-  'template' => 'yoga',
-  'theme' => 'Sylvia',
-  'icon_dir' => 'template/yoga/theme/Sylvia/icon',
-  'admin_icon_dir' => 'template/yoga/icon/admin',
-  'mime_icon_dir' => 'template/yoga/theme/Sylvia/icon/mimetypes/',
-  'local_head' => '
-<!--[if IE]> 
-	<link rel="stylesheet" href="template/yoga/theme/Sylvia/theme-ie.css" type="text/css">
-<![endif]-->
-  ',
-);
-?>
diff --git a/template/yoga/theme/clear/themeconf.inc.php b/template/yoga/theme/clear/themeconf.inc.php
deleted file mode 100644
index 4858b7b50..000000000
--- a/template/yoga/theme/clear/themeconf.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$themeconf = array(
-  'template' => 'yoga',
-  'theme' => 'clear',
-  'icon_dir' => 'template/yoga/icon',
-  'admin_icon_dir' => 'template/yoga/icon/admin',
-  'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
-  'local_head' => '',
-);
-?>
diff --git a/template/yoga/theme/dark/themeconf.inc.php b/template/yoga/theme/dark/themeconf.inc.php
deleted file mode 100644
index d59843ba8..000000000
--- a/template/yoga/theme/dark/themeconf.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$themeconf = array(
-  'template' => 'yoga',
-  'theme' => 'dark',
-  'icon_dir' => 'template/yoga/icon',
-  'admin_icon_dir' => 'template/yoga/icon/admin',
-  'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
-  'local_head' => '',
-);
-?>
diff --git a/template/yoga/theme/p0w0/themeconf.inc.php b/template/yoga/theme/p0w0/themeconf.inc.php
deleted file mode 100644
index 063a60bc8..000000000
--- a/template/yoga/theme/p0w0/themeconf.inc.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$themeconf = array(
-  'template' => 'yoga',
-  'theme' => 'p0w0',
-  'icon_dir' => 'template/yoga/icon',
-  'admin_icon_dir' => 'template/yoga/icon/admin',
-  'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
-  'local_head' => '',
-);
-?>
diff --git a/template/yoga/theme/Sylvia/icon/add_tag.png b/themes/Sylvia/icon/add_tag.png
index 66042aadf..66042aadf 100644
--- a/template/yoga/theme/Sylvia/icon/add_tag.png
+++ b/themes/Sylvia/icon/add_tag.png
diff --git a/template/yoga/theme/Sylvia/icon/caddie_add.png b/themes/Sylvia/icon/caddie_add.png
index 14dfc5684..14dfc5684 100644
--- a/template/yoga/theme/Sylvia/icon/caddie_add.png
+++ b/themes/Sylvia/icon/caddie_add.png
diff --git a/template/yoga/theme/Sylvia/icon/calendar.png b/themes/Sylvia/icon/calendar.png
index 0044c1e93..0044c1e93 100644
--- a/template/yoga/theme/Sylvia/icon/calendar.png
+++ b/themes/Sylvia/icon/calendar.png
diff --git a/template/yoga/theme/Sylvia/icon/calendar_created.png b/themes/Sylvia/icon/calendar_created.png
index 607fc0a4a..607fc0a4a 100644
--- a/template/yoga/theme/Sylvia/icon/calendar_created.png
+++ b/themes/Sylvia/icon/calendar_created.png
diff --git a/template/yoga/theme/Sylvia/icon/category_edit.png b/themes/Sylvia/icon/category_edit.png
index 3ace19daf..3ace19daf 100644
--- a/template/yoga/theme/Sylvia/icon/category_edit.png
+++ b/themes/Sylvia/icon/category_edit.png
diff --git a/template/yoga/theme/Sylvia/icon/datepicker.png b/themes/Sylvia/icon/datepicker.png
index 3d0e015f6..3d0e015f6 100644
--- a/template/yoga/theme/Sylvia/icon/datepicker.png
+++ b/themes/Sylvia/icon/datepicker.png
diff --git a/template/yoga/theme/Sylvia/icon/dec_period.png b/themes/Sylvia/icon/dec_period.png
index 6a9d2bfa7..6a9d2bfa7 100644
--- a/template/yoga/theme/Sylvia/icon/dec_period.png
+++ b/themes/Sylvia/icon/dec_period.png
diff --git a/template/yoga/theme/Sylvia/icon/dec_period_unactive.png b/themes/Sylvia/icon/dec_period_unactive.png
index 5cb58ba8e..5cb58ba8e 100644
--- a/template/yoga/theme/Sylvia/icon/dec_period_unactive.png
+++ b/themes/Sylvia/icon/dec_period_unactive.png
diff --git a/template/yoga/theme/Sylvia/icon/del_favorite.png b/themes/Sylvia/icon/del_favorite.png
index bea4720cf..bea4720cf 100644
--- a/template/yoga/theme/Sylvia/icon/del_favorite.png
+++ b/themes/Sylvia/icon/del_favorite.png
diff --git a/template/yoga/theme/Sylvia/icon/delete.png b/themes/Sylvia/icon/delete.png
index 285e53e19..285e53e19 100644
--- a/template/yoga/theme/Sylvia/icon/delete.png
+++ b/themes/Sylvia/icon/delete.png
diff --git a/template/yoga/icon/edit.png b/themes/Sylvia/icon/edit.png
index 9c755cda1..9c755cda1 100644
--- a/template/yoga/icon/edit.png
+++ b/themes/Sylvia/icon/edit.png
diff --git a/template/yoga/theme/Sylvia/icon/errors.png b/themes/Sylvia/icon/errors.png
index e26d8c6e5..e26d8c6e5 100644
--- a/template/yoga/theme/Sylvia/icon/errors.png
+++ b/themes/Sylvia/icon/errors.png
diff --git a/template/yoga/theme/Sylvia/icon/exit.png b/themes/Sylvia/icon/exit.png
index 685cc44b5..685cc44b5 100644
--- a/template/yoga/theme/Sylvia/icon/exit.png
+++ b/themes/Sylvia/icon/exit.png
diff --git a/template-common/favicon.ico b/themes/Sylvia/icon/favicon.ico
index d7a1d89fd..d7a1d89fd 100644
--- a/template-common/favicon.ico
+++ b/themes/Sylvia/icon/favicon.ico
diff --git a/template/yoga/theme/Sylvia/icon/favorite.png b/themes/Sylvia/icon/favorite.png
index 2caa31687..2caa31687 100644
--- a/template/yoga/theme/Sylvia/icon/favorite.png
+++ b/themes/Sylvia/icon/favorite.png
diff --git a/template/yoga/theme/Sylvia/icon/first.png b/themes/Sylvia/icon/first.png
index de15054a1..de15054a1 100644
--- a/template/yoga/theme/Sylvia/icon/first.png
+++ b/themes/Sylvia/icon/first.png
diff --git a/template/yoga/theme/Sylvia/icon/first_unactive.png b/themes/Sylvia/icon/first_unactive.png
index 2eca53a3c..2eca53a3c 100644
--- a/template/yoga/theme/Sylvia/icon/first_unactive.png
+++ b/themes/Sylvia/icon/first_unactive.png
diff --git a/template/yoga/theme/Sylvia/icon/flat.png b/themes/Sylvia/icon/flat.png
index 291156950..291156950 100644
--- a/template/yoga/theme/Sylvia/icon/flat.png
+++ b/themes/Sylvia/icon/flat.png
diff --git a/template/yoga/theme/Sylvia/icon/help.png b/themes/Sylvia/icon/help.png
index cd1d20919..cd1d20919 100644
--- a/template/yoga/theme/Sylvia/icon/help.png
+++ b/themes/Sylvia/icon/help.png
diff --git a/template/yoga/theme/Sylvia/icon/home.png b/themes/Sylvia/icon/home.png
index 81b6bddb7..81b6bddb7 100644
--- a/template/yoga/theme/Sylvia/icon/home.png
+++ b/themes/Sylvia/icon/home.png
diff --git a/template/yoga/theme/Sylvia/icon/inc_period.png b/themes/Sylvia/icon/inc_period.png
index 72860d6db..72860d6db 100644
--- a/template/yoga/theme/Sylvia/icon/inc_period.png
+++ b/themes/Sylvia/icon/inc_period.png
diff --git a/template/yoga/theme/Sylvia/icon/inc_period_unactive.png b/themes/Sylvia/icon/inc_period_unactive.png
index f28f986c2..f28f986c2 100644
--- a/template/yoga/theme/Sylvia/icon/inc_period_unactive.png
+++ b/themes/Sylvia/icon/inc_period_unactive.png
diff --git a/template-common/index.php b/themes/Sylvia/icon/index.php
index 871b52b6a..871b52b6a 100644
--- a/template-common/index.php
+++ b/themes/Sylvia/icon/index.php
diff --git a/template/yoga/theme/Sylvia/icon/infos.png b/themes/Sylvia/icon/infos.png
index 00695cb8f..00695cb8f 100644
--- a/template/yoga/theme/Sylvia/icon/infos.png
+++ b/themes/Sylvia/icon/infos.png
diff --git a/template/yoga/theme/Sylvia/icon/last.png b/themes/Sylvia/icon/last.png
index 89ec3f8da..89ec3f8da 100644
--- a/template/yoga/theme/Sylvia/icon/last.png
+++ b/themes/Sylvia/icon/last.png
diff --git a/template/yoga/theme/Sylvia/icon/last_unactive.png b/themes/Sylvia/icon/last_unactive.png
index 76f47f5b0..76f47f5b0 100644
--- a/template/yoga/theme/Sylvia/icon/last_unactive.png
+++ b/themes/Sylvia/icon/last_unactive.png
diff --git a/template/yoga/theme/Sylvia/icon/left.png b/themes/Sylvia/icon/left.png
index 2d2ff0b08..2d2ff0b08 100644
--- a/template/yoga/theme/Sylvia/icon/left.png
+++ b/themes/Sylvia/icon/left.png
diff --git a/template/yoga/theme/Sylvia/icon/left_unactive.png b/themes/Sylvia/icon/left_unactive.png
index 0b5abd707..0b5abd707 100644
--- a/template/yoga/theme/Sylvia/icon/left_unactive.png
+++ b/themes/Sylvia/icon/left_unactive.png
diff --git a/template/yoga/theme/Sylvia/icon/lost_password.png b/themes/Sylvia/icon/lost_password.png
index 012ba4b28..012ba4b28 100644
--- a/template/yoga/theme/Sylvia/icon/lost_password.png
+++ b/themes/Sylvia/icon/lost_password.png
diff --git a/template/yoga/theme/Sylvia/icon/metadata.png b/themes/Sylvia/icon/metadata.png
index 25da864c3..25da864c3 100644
--- a/template/yoga/theme/Sylvia/icon/metadata.png
+++ b/themes/Sylvia/icon/metadata.png
diff --git a/template/yoga/theme/Sylvia/icon/metadata_grey.png b/themes/Sylvia/icon/metadata_grey.png
index 9463f1980..9463f1980 100644
--- a/template/yoga/theme/Sylvia/icon/metadata_grey.png
+++ b/themes/Sylvia/icon/metadata_grey.png
diff --git a/template/yoga/theme/Sylvia/icon/mimetypes/avi.png b/themes/Sylvia/icon/mimetypes/avi.png
index b5dde0869..b5dde0869 100644
--- a/template/yoga/theme/Sylvia/icon/mimetypes/avi.png
+++ b/themes/Sylvia/icon/mimetypes/avi.png
diff --git a/template/index.php b/themes/Sylvia/icon/mimetypes/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/index.php
+++ b/themes/Sylvia/icon/mimetypes/index.php
diff --git a/template/yoga/theme/Sylvia/icon/mimetypes/mp3.png b/themes/Sylvia/icon/mimetypes/mp3.png
index cb1288596..cb1288596 100644
--- a/template/yoga/theme/Sylvia/icon/mimetypes/mp3.png
+++ b/themes/Sylvia/icon/mimetypes/mp3.png
diff --git a/template/yoga/theme/Sylvia/icon/mimetypes/mpg.png b/themes/Sylvia/icon/mimetypes/mpg.png
index 4dc09c28b..4dc09c28b 100644
--- a/template/yoga/theme/Sylvia/icon/mimetypes/mpg.png
+++ b/themes/Sylvia/icon/mimetypes/mpg.png
diff --git a/template/yoga/theme/Sylvia/icon/mimetypes/ogg.png b/themes/Sylvia/icon/mimetypes/ogg.png
index 978b235f9..978b235f9 100644
--- a/template/yoga/theme/Sylvia/icon/mimetypes/ogg.png
+++ b/themes/Sylvia/icon/mimetypes/ogg.png
diff --git a/template/yoga/theme/Sylvia/icon/mimetypes/zip.png b/themes/Sylvia/icon/mimetypes/zip.png
index 7d76f9a60..7d76f9a60 100644
--- a/template/yoga/theme/Sylvia/icon/mimetypes/zip.png
+++ b/themes/Sylvia/icon/mimetypes/zip.png
diff --git a/template/yoga/theme/Sylvia/icon/normal_mode.png b/themes/Sylvia/icon/normal_mode.png
index a141c5523..a141c5523 100644
--- a/template/yoga/theme/Sylvia/icon/normal_mode.png
+++ b/themes/Sylvia/icon/normal_mode.png
diff --git a/template/yoga/theme/Sylvia/icon/note.png b/themes/Sylvia/icon/note.png
index 9ef1af537..9ef1af537 100644
--- a/template/yoga/theme/Sylvia/icon/note.png
+++ b/themes/Sylvia/icon/note.png
diff --git a/template/yoga/theme/Sylvia/icon/pause.png b/themes/Sylvia/icon/pause.png
index 2bb742f24..2bb742f24 100644
--- a/template/yoga/theme/Sylvia/icon/pause.png
+++ b/themes/Sylvia/icon/pause.png
diff --git a/template/yoga/theme/Sylvia/icon/pause_selected.png b/themes/Sylvia/icon/pause_selected.png
index 2bb742f24..2bb742f24 100644
--- a/template/yoga/theme/Sylvia/icon/pause_selected.png
+++ b/themes/Sylvia/icon/pause_selected.png
diff --git a/template/yoga/theme/Sylvia/icon/pause_unactive.png b/themes/Sylvia/icon/pause_unactive.png
index c756d2aa3..c756d2aa3 100644
--- a/template/yoga/theme/Sylvia/icon/pause_unactive.png
+++ b/themes/Sylvia/icon/pause_unactive.png
diff --git a/template/yoga/theme/Sylvia/icon/play.png b/themes/Sylvia/icon/play.png
index be1b8eeb6..be1b8eeb6 100644
--- a/template/yoga/theme/Sylvia/icon/play.png
+++ b/themes/Sylvia/icon/play.png
diff --git a/template/yoga/theme/Sylvia/icon/preferences.png b/themes/Sylvia/icon/preferences.png
index 8634b5159..8634b5159 100644
--- a/template/yoga/theme/Sylvia/icon/preferences.png
+++ b/themes/Sylvia/icon/preferences.png
diff --git a/template/yoga/theme/Sylvia/icon/rating-stars.gif b/themes/Sylvia/icon/rating-stars.gif
index 4059e0329..4059e0329 100644
--- a/template/yoga/theme/Sylvia/icon/rating-stars.gif
+++ b/themes/Sylvia/icon/rating-stars.gif
diff --git a/template/yoga/theme/Sylvia/icon/rating-stars.png b/themes/Sylvia/icon/rating-stars.png
index dba59ef00..dba59ef00 100644
--- a/template/yoga/theme/Sylvia/icon/rating-stars.png
+++ b/themes/Sylvia/icon/rating-stars.png
diff --git a/template/yoga/theme/Sylvia/icon/recent.png b/themes/Sylvia/icon/recent.png
index 75567d689..75567d689 100644
--- a/template/yoga/theme/Sylvia/icon/recent.png
+++ b/themes/Sylvia/icon/recent.png
diff --git a/template/yoga/theme/Sylvia/icon/recent_by_child.png b/themes/Sylvia/icon/recent_by_child.png
index faf5c4d5c..faf5c4d5c 100644
--- a/template/yoga/theme/Sylvia/icon/recent_by_child.png
+++ b/themes/Sylvia/icon/recent_by_child.png
diff --git a/template/yoga/theme/Sylvia/icon/recent_s.png b/themes/Sylvia/icon/recent_s.png
index 90b190523..90b190523 100644
--- a/template/yoga/theme/Sylvia/icon/recent_s.png
+++ b/themes/Sylvia/icon/recent_s.png
diff --git a/template/yoga/theme/Sylvia/icon/recent_s_by_child.png b/themes/Sylvia/icon/recent_s_by_child.png
index 842a513c4..842a513c4 100644
--- a/template/yoga/theme/Sylvia/icon/recent_s_by_child.png
+++ b/themes/Sylvia/icon/recent_s_by_child.png
diff --git a/template/yoga/theme/Sylvia/icon/register.png b/themes/Sylvia/icon/register.png
index 677c7b9e9..677c7b9e9 100644
--- a/template/yoga/theme/Sylvia/icon/register.png
+++ b/themes/Sylvia/icon/register.png
diff --git a/template/yoga/theme/Sylvia/icon/remove_s.png b/themes/Sylvia/icon/remove_s.png
index 012efc1ad..012efc1ad 100644
--- a/template/yoga/theme/Sylvia/icon/remove_s.png
+++ b/themes/Sylvia/icon/remove_s.png
diff --git a/template/yoga/theme/Sylvia/icon/representative.png b/themes/Sylvia/icon/representative.png
index 02a914da1..02a914da1 100644
--- a/template/yoga/theme/Sylvia/icon/representative.png
+++ b/themes/Sylvia/icon/representative.png
diff --git a/template/yoga/theme/Sylvia/icon/right.png b/themes/Sylvia/icon/right.png
index 6ede2ff93..6ede2ff93 100644
--- a/template/yoga/theme/Sylvia/icon/right.png
+++ b/themes/Sylvia/icon/right.png
diff --git a/template/yoga/theme/Sylvia/icon/right_unactive.png b/themes/Sylvia/icon/right_unactive.png
index 483cd7989..483cd7989 100644
--- a/template/yoga/theme/Sylvia/icon/right_unactive.png
+++ b/themes/Sylvia/icon/right_unactive.png
diff --git a/template/yoga/theme/Sylvia/icon/save.png b/themes/Sylvia/icon/save.png
index 56515f42e..56515f42e 100644
--- a/template/yoga/theme/Sylvia/icon/save.png
+++ b/themes/Sylvia/icon/save.png
diff --git a/template/yoga/theme/Sylvia/icon/save_selected.png b/themes/Sylvia/icon/save_selected.png
index 24aeee308..24aeee308 100644
--- a/template/yoga/theme/Sylvia/icon/save_selected.png
+++ b/themes/Sylvia/icon/save_selected.png
diff --git a/template/yoga/theme/Sylvia/icon/search_rules.png b/themes/Sylvia/icon/search_rules.png
index cc23092a0..cc23092a0 100644
--- a/template/yoga/theme/Sylvia/icon/search_rules.png
+++ b/themes/Sylvia/icon/search_rules.png
diff --git a/template/yoga/theme/Sylvia/icon/slideshow.png b/themes/Sylvia/icon/slideshow.png
index 9263fdcbc..9263fdcbc 100644
--- a/template/yoga/theme/Sylvia/icon/slideshow.png
+++ b/themes/Sylvia/icon/slideshow.png
diff --git a/template/yoga/theme/Sylvia/icon/slideshow_selected.png b/themes/Sylvia/icon/slideshow_selected.png
index 1ab04e0d4..1ab04e0d4 100644
--- a/template/yoga/theme/Sylvia/icon/slideshow_selected.png
+++ b/themes/Sylvia/icon/slideshow_selected.png
diff --git a/template/yoga/theme/Sylvia/icon/start_filter.png b/themes/Sylvia/icon/start_filter.png
index f8611cd83..f8611cd83 100644
--- a/template/yoga/theme/Sylvia/icon/start_filter.png
+++ b/themes/Sylvia/icon/start_filter.png
diff --git a/template/yoga/theme/Sylvia/icon/start_repeat.png b/themes/Sylvia/icon/start_repeat.png
index fc58db189..fc58db189 100644
--- a/template/yoga/theme/Sylvia/icon/start_repeat.png
+++ b/themes/Sylvia/icon/start_repeat.png
diff --git a/template/yoga/theme/Sylvia/icon/start_repeat_grey.png b/themes/Sylvia/icon/start_repeat_grey.png
index d135b913d..d135b913d 100644
--- a/template/yoga/theme/Sylvia/icon/start_repeat_grey.png
+++ b/themes/Sylvia/icon/start_repeat_grey.png
diff --git a/template/yoga/theme/Sylvia/icon/start_slideshow.png b/themes/Sylvia/icon/start_slideshow.png
index 1ab04e0d4..1ab04e0d4 100644
--- a/template/yoga/theme/Sylvia/icon/start_slideshow.png
+++ b/themes/Sylvia/icon/start_slideshow.png
diff --git a/template/yoga/theme/Sylvia/icon/stop_filter.png b/themes/Sylvia/icon/stop_filter.png
index 145e64cc8..145e64cc8 100644
--- a/template/yoga/theme/Sylvia/icon/stop_filter.png
+++ b/themes/Sylvia/icon/stop_filter.png
diff --git a/template/yoga/theme/Sylvia/icon/stop_repeat.png b/themes/Sylvia/icon/stop_repeat.png
index f91f44843..f91f44843 100644
--- a/template/yoga/theme/Sylvia/icon/stop_repeat.png
+++ b/themes/Sylvia/icon/stop_repeat.png
diff --git a/template/yoga/theme/Sylvia/icon/stop_repeat_pink.png b/themes/Sylvia/icon/stop_repeat_pink.png
index 9c71c7d06..9c71c7d06 100644
--- a/template/yoga/theme/Sylvia/icon/stop_repeat_pink.png
+++ b/themes/Sylvia/icon/stop_repeat_pink.png
diff --git a/template/yoga/theme/Sylvia/icon/stop_selected.png b/themes/Sylvia/icon/stop_selected.png
index 3262bbfeb..3262bbfeb 100644
--- a/template/yoga/theme/Sylvia/icon/stop_selected.png
+++ b/themes/Sylvia/icon/stop_selected.png
diff --git a/template/yoga/theme/Sylvia/icon/stop_slideshow.png b/themes/Sylvia/icon/stop_slideshow.png
index b76c73be7..b76c73be7 100644
--- a/template/yoga/theme/Sylvia/icon/stop_slideshow.png
+++ b/themes/Sylvia/icon/stop_slideshow.png
diff --git a/template/yoga/theme/Sylvia/icon/stop_unactive.png b/themes/Sylvia/icon/stop_unactive.png
index 99dccf926..99dccf926 100644
--- a/template/yoga/theme/Sylvia/icon/stop_unactive.png
+++ b/themes/Sylvia/icon/stop_unactive.png
diff --git a/template/yoga/theme/Sylvia/icon/tag_cloud.png b/themes/Sylvia/icon/tag_cloud.png
index 988e5415a..988e5415a 100644
--- a/template/yoga/theme/Sylvia/icon/tag_cloud.png
+++ b/themes/Sylvia/icon/tag_cloud.png
diff --git a/template/yoga/theme/Sylvia/icon/tag_cloud_grey.png b/themes/Sylvia/icon/tag_cloud_grey.png
index 90e32bc60..90e32bc60 100644
--- a/template/yoga/theme/Sylvia/icon/tag_cloud_grey.png
+++ b/themes/Sylvia/icon/tag_cloud_grey.png
diff --git a/template/yoga/theme/Sylvia/icon/tag_letters.png b/themes/Sylvia/icon/tag_letters.png
index eaab2ff4a..eaab2ff4a 100644
--- a/template/yoga/theme/Sylvia/icon/tag_letters.png
+++ b/themes/Sylvia/icon/tag_letters.png
diff --git a/template/yoga/theme/Sylvia/icon/tag_letters_grey.png b/themes/Sylvia/icon/tag_letters_grey.png
index 9ec2fcfd4..9ec2fcfd4 100644
--- a/template/yoga/theme/Sylvia/icon/tag_letters_grey.png
+++ b/themes/Sylvia/icon/tag_letters_grey.png
diff --git a/template/yoga/theme/Sylvia/icon/tag_letters_pink.png b/themes/Sylvia/icon/tag_letters_pink.png
index 21d5faba9..21d5faba9 100644
--- a/template/yoga/theme/Sylvia/icon/tag_letters_pink.png
+++ b/themes/Sylvia/icon/tag_letters_pink.png
diff --git a/template/yoga/theme/Sylvia/icon/up.png b/themes/Sylvia/icon/up.png
index c997af2f5..c997af2f5 100644
--- a/template/yoga/theme/Sylvia/icon/up.png
+++ b/themes/Sylvia/icon/up.png
diff --git a/template/yoga/theme/Sylvia/icon/validate_s.png b/themes/Sylvia/icon/validate_s.png
index adea3d580..adea3d580 100644
--- a/template/yoga/theme/Sylvia/icon/validate_s.png
+++ b/themes/Sylvia/icon/validate_s.png
diff --git a/template/yoga/theme/Sylvia/images/bottom-left-bg.jpg b/themes/Sylvia/images/bottom-left-bg.jpg
index 3d8a5eed2..3d8a5eed2 100644
--- a/template/yoga/theme/Sylvia/images/bottom-left-bg.jpg
+++ b/themes/Sylvia/images/bottom-left-bg.jpg
diff --git a/template/yoga/theme/Sylvia/images/cat_bottom-left.gif b/themes/Sylvia/images/cat_bottom-left.gif
index 2a042897d..2a042897d 100644
--- a/template/yoga/theme/Sylvia/images/cat_bottom-left.gif
+++ b/themes/Sylvia/images/cat_bottom-left.gif
diff --git a/template/yoga/theme/Sylvia/images/cat_bottom-right.gif b/themes/Sylvia/images/cat_bottom-right.gif
index 901f31d52..901f31d52 100644
--- a/template/yoga/theme/Sylvia/images/cat_bottom-right.gif
+++ b/themes/Sylvia/images/cat_bottom-right.gif
diff --git a/template/yoga/theme/Sylvia/images/cat_top-left.gif b/themes/Sylvia/images/cat_top-left.gif
index 1ea57346e..1ea57346e 100644
--- a/template/yoga/theme/Sylvia/images/cat_top-left.gif
+++ b/themes/Sylvia/images/cat_top-left.gif
diff --git a/template/yoga/theme/Sylvia/images/cat_top-right.gif b/themes/Sylvia/images/cat_top-right.gif
index 7eb5c491e..7eb5c491e 100644
--- a/template/yoga/theme/Sylvia/images/cat_top-right.gif
+++ b/themes/Sylvia/images/cat_top-right.gif
diff --git a/template/yoga/theme/Sylvia/images/fillet.gif b/themes/Sylvia/images/fillet.gif
index 6da64117b..6da64117b 100644
--- a/template/yoga/theme/Sylvia/images/fillet.gif
+++ b/themes/Sylvia/images/fillet.gif
diff --git a/template/yoga/theme/Sylvia/images/header_msgs-bg.gif b/themes/Sylvia/images/header_msgs-bg.gif
index 0879e1b79..0879e1b79 100644
--- a/template/yoga/theme/Sylvia/images/header_msgs-bg.gif
+++ b/themes/Sylvia/images/header_msgs-bg.gif
diff --git a/template/yoga/theme/Sylvia/images/menuBox_bottom.gif b/themes/Sylvia/images/menuBox_bottom.gif
index 72c91b117..72c91b117 100644
--- a/template/yoga/theme/Sylvia/images/menuBox_bottom.gif
+++ b/themes/Sylvia/images/menuBox_bottom.gif
diff --git a/template/yoga/theme/Sylvia/images/menuBox_sides.gif b/themes/Sylvia/images/menuBox_sides.gif
index 853772da3..853772da3 100644
--- a/template/yoga/theme/Sylvia/images/menuBox_sides.gif
+++ b/themes/Sylvia/images/menuBox_sides.gif
diff --git a/template/yoga/theme/Sylvia/images/menuBox_top.gif b/themes/Sylvia/images/menuBox_top.gif
index 3c80b3cf9..3c80b3cf9 100644
--- a/template/yoga/theme/Sylvia/images/menuBox_top.gif
+++ b/themes/Sylvia/images/menuBox_top.gif
diff --git a/template/yoga/theme/Sylvia/images/menuId_bottom.gif b/themes/Sylvia/images/menuId_bottom.gif
index e6d1faa1d..e6d1faa1d 100644
--- a/template/yoga/theme/Sylvia/images/menuId_bottom.gif
+++ b/themes/Sylvia/images/menuId_bottom.gif
diff --git a/template/yoga/theme/Sylvia/images/menuId_sides.gif b/themes/Sylvia/images/menuId_sides.gif
index 68923cba2..68923cba2 100644
--- a/template/yoga/theme/Sylvia/images/menuId_sides.gif
+++ b/themes/Sylvia/images/menuId_sides.gif
diff --git a/template/yoga/theme/Sylvia/images/menuId_top.gif b/themes/Sylvia/images/menuId_top.gif
index 5243a4097..5243a4097 100644
--- a/template/yoga/theme/Sylvia/images/menuId_top.gif
+++ b/themes/Sylvia/images/menuId_top.gif
diff --git a/template/yoga/theme/Sylvia/images/top-left-bg.jpg b/themes/Sylvia/images/top-left-bg.jpg
index 98aa1d6a5..98aa1d6a5 100644
--- a/template/yoga/theme/Sylvia/images/top-left-bg.jpg
+++ b/themes/Sylvia/images/top-left-bg.jpg
diff --git a/template/yoga/theme/Sylvia/images/transparent.gif b/themes/Sylvia/images/transparent.gif
index 2fb4189a1..2fb4189a1 100644
--- a/template/yoga/theme/Sylvia/images/transparent.gif
+++ b/themes/Sylvia/images/transparent.gif
diff --git a/template/yoga/icon/admin/index.php b/themes/Sylvia/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/icon/admin/index.php
+++ b/themes/Sylvia/index.php
diff --git a/template/yoga/theme/Sylvia/mail-css.tpl b/themes/Sylvia/mail-css.tpl
index 9924ab4a7..df0f7067f 100644
--- a/template/yoga/theme/Sylvia/mail-css.tpl
+++ b/themes/Sylvia/mail-css.tpl
@@ -5,7 +5,7 @@ body {ldelim} background-color:#111; color:#666;}
 #content {ldelim} }
 #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.jpg) no-repeat scroll left bottom;
 min-height: 220px; height: 220px; width: 100%; min-width: 100%; padding: 10px 100px 30px 100px; }
-h2 {ldelim} color:#f70;background: transparent url({$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/images/fillet.gif) repeat-x scroll left bottom; padding-bottom: 5px;}
+h2 {ldelim} color:#f70;background: transparent url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/fillet.gif) repeat-x scroll left bottom; padding-bottom: 5px;}
 img {ldelim} margin: 16px; border: 16px solid #444; -moz-border-radius: 4px; border-radius: 4px 4px; }
 img:hover {ldelim} padding: 15px; border: 0; background-color:#222;-moz-border-radius: 4px; border-radius: 4px 4px; }
 a {ldelim} color: #f70; background-color: transparent; border:0; text-decoration: none;}
diff --git a/template/yoga/theme/Sylvia/theme-ie.css b/themes/Sylvia/theme-ie.css
index e92e5b34d..e92e5b34d 100644
--- a/template/yoga/theme/Sylvia/theme-ie.css
+++ b/themes/Sylvia/theme-ie.css
diff --git a/template/yoga/theme/Sylvia/theme.css b/themes/Sylvia/theme.css
index b4182391e..b4182391e 100644
--- a/template/yoga/theme/Sylvia/theme.css
+++ b/themes/Sylvia/theme.css
diff --git a/template/yoga/icon/index.php b/themes/clear/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/icon/index.php
+++ b/themes/clear/index.php
diff --git a/template/yoga/theme/clear/mail-css.tpl b/themes/clear/mail-css.tpl
index 298926540..298926540 100644
--- a/template/yoga/theme/clear/mail-css.tpl
+++ b/themes/clear/mail-css.tpl
diff --git a/template/yoga/theme/clear/theme.css b/themes/clear/theme.css
index c407e95de..c407e95de 100644
--- a/template/yoga/theme/clear/theme.css
+++ b/themes/clear/theme.css
diff --git a/template/yoga/icon/mimetypes/index.php b/themes/dark/images/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/icon/mimetypes/index.php
+++ b/themes/dark/images/index.php
diff --git a/template/yoga/theme/dark/images/tableh1_bg.png b/themes/dark/images/tableh1_bg.png
index c7785d0f6..c7785d0f6 100644
--- a/template/yoga/theme/dark/images/tableh1_bg.png
+++ b/themes/dark/images/tableh1_bg.png
diff --git a/template/yoga/theme/dark/images/tableh2_bg.png b/themes/dark/images/tableh2_bg.png
index d8c29f93d..d8c29f93d 100644
--- a/template/yoga/theme/dark/images/tableh2_bg.png
+++ b/themes/dark/images/tableh2_bg.png
diff --git a/template/yoga/index.php b/themes/dark/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/index.php
+++ b/themes/dark/index.php
diff --git a/template/yoga/theme/dark/mail-css.tpl b/themes/dark/mail-css.tpl
index a3dce91a8..26b51578b 100644
--- a/template/yoga/theme/dark/mail-css.tpl
+++ b/themes/dark/mail-css.tpl
@@ -5,7 +5,7 @@ body {ldelim} background-color:#444; color:#fff;}
 #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
 #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
 color: #69c;}
-h2 {ldelim} background-color: #333;color:#fff48e;background-image: url({$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/images/tableh1_bg.png);}
+h2 {ldelim} background-color: #333;color:#fff48e;background-image: url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/tableh1_bg.png);}
 img {ldelim} margin: 16px; border: 16px solid #111; -moz-border-radius: 4px; border-radius: 4px 4px; }
 img:hover {ldelim} padding: 15px; border: 1px solid yellow;background-color:#444;-moz-border-radius: 4px; border-radius: 4px 4px; }
 a {ldelim} color: #fff48e; background: transparent;border-bottom:1px dotted #005e89; }
diff --git a/template/yoga/theme/dark/theme.css b/themes/dark/theme.css
index eea9562cb..eea9562cb 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/themes/dark/theme.css
diff --git a/template/yoga/content.css b/themes/default/content.css
index 11023f104..11023f104 100644
--- a/template/yoga/content.css
+++ b/themes/default/content.css
diff --git a/template/yoga/default-colors.css b/themes/default/default-colors.css
index cc094cf0e..cc094cf0e 100644
--- a/template/yoga/default-colors.css
+++ b/themes/default/default-colors.css
diff --git a/template/yoga/default-layout.css b/themes/default/default-layout.css
index ada2ba518..fda1c4f6e 100644
--- a/template/yoga/default-layout.css
+++ b/themes/default/default-layout.css
@@ -272,3 +272,43 @@ TABLE.tagLetterContent {
 IMG.ui-datepicker-trigger {
 	cursor : pointer;
 }
+
+/* Set the width of the menubar for the galery */
+#menubar {
+  width: 18em;
+}
+.content {
+  margin-left: 20em;  /* = #menubar width + 2em */
+}
+/* Set minimum width of the page before getting a scrollbar */
+/* IE5 and IE6 don't get that */
+BODY {
+  min-width: 60em;  /* ~ 3* #menubar width */
+}
+BODY#thePopuphelpPage {
+  min-width: 0;
+}
+
+/* Set some sizes according to your maximum thumbnail width and height */
+.content UL.thumbnails SPAN,
+.content UL.thumbnails SPAN.wrap2 A,
+.content UL.thumbnails LABEL,
+.content DIV.thumbnailCategory DIV.illustration {
+  width: 140px;      /* max thumbnail width + 2px */
+}
+.content UL.thumbnails SPAN.wrap2,
+.content DIV.thumbnailCategory DIV.description {
+  height: 140px;    /* max thumbnail height + 2px */
+}
+
+
+/* Category thumbnails on main page */
+.content UL.thumbnailCategories LI {
+  width: 49.7%;    /* 49.7% for 2 per line, 33.2% for 3 per line*/
+}
+
+/* Set defaults for thumbnails legend */
+.content UL.thumbnails SPAN.thumbLegend {
+  display: block;  /* display: none; if you don't want legend */
+  height: 4em;    /* legend height (don't set auto to be Gecko friendly)*/
+}
diff --git a/template/yoga/fix-ie5-ie6.css b/themes/default/fix-ie5-ie6.css
index 54018fea1..54018fea1 100644
--- a/template/yoga/fix-ie5-ie6.css
+++ b/themes/default/fix-ie5-ie6.css
diff --git a/template/yoga/fix-ie7.css b/themes/default/fix-ie7.css
index 70ddf7e8b..70ddf7e8b 100644
--- a/template/yoga/fix-ie7.css
+++ b/themes/default/fix-ie7.css
diff --git a/template/yoga/fix-khtml.css b/themes/default/fix-khtml.css
index a0377886c..a0377886c 100644
--- a/template/yoga/fix-khtml.css
+++ b/themes/default/fix-khtml.css
diff --git a/template/yoga/icon/add_tag.png b/themes/default/icon/add_tag.png
index 9051a1d26..9051a1d26 100644
--- a/template/yoga/icon/add_tag.png
+++ b/themes/default/icon/add_tag.png
diff --git a/template/yoga/icon/admin/errors.png b/themes/default/icon/admin/errors.png
index 3c8a37df5..3c8a37df5 100644
--- a/template/yoga/icon/admin/errors.png
+++ b/themes/default/icon/admin/errors.png
diff --git a/template/yoga/mail/index.php b/themes/default/icon/admin/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/mail/index.php
+++ b/themes/default/icon/admin/index.php
diff --git a/template/yoga/icon/admin/infos.png b/themes/default/icon/admin/infos.png
index dc8c8a457..dc8c8a457 100644
--- a/template/yoga/icon/admin/infos.png
+++ b/themes/default/icon/admin/infos.png
diff --git a/template/yoga/icon/caddie_add.png b/themes/default/icon/caddie_add.png
index eb20f4e06..eb20f4e06 100644
--- a/template/yoga/icon/caddie_add.png
+++ b/themes/default/icon/caddie_add.png
diff --git a/template/yoga/icon/calendar.png b/themes/default/icon/calendar.png
index e0a44a13d..e0a44a13d 100644
--- a/template/yoga/icon/calendar.png
+++ b/themes/default/icon/calendar.png
diff --git a/template/yoga/icon/calendar_created.png b/themes/default/icon/calendar_created.png
index 14a84c43c..14a84c43c 100644
--- a/template/yoga/icon/calendar_created.png
+++ b/themes/default/icon/calendar_created.png
diff --git a/template/yoga/icon/category_children.png b/themes/default/icon/category_children.png
index 7205c3f61..7205c3f61 100644
--- a/template/yoga/icon/category_children.png
+++ b/themes/default/icon/category_children.png
diff --git a/template/yoga/icon/category_edit.png b/themes/default/icon/category_edit.png
index 0f3b619ed..0f3b619ed 100644
--- a/template/yoga/icon/category_edit.png
+++ b/themes/default/icon/category_edit.png
diff --git a/template/yoga/icon/category_representant_random.png b/themes/default/icon/category_representant_random.png
index dfa69846f..dfa69846f 100644
--- a/template/yoga/icon/category_representant_random.png
+++ b/themes/default/icon/category_representant_random.png
diff --git a/template/yoga/icon/datepicker.png b/themes/default/icon/datepicker.png
index bbb299207..bbb299207 100644
--- a/template/yoga/icon/datepicker.png
+++ b/themes/default/icon/datepicker.png
diff --git a/template/yoga/icon/dec_period.png b/themes/default/icon/dec_period.png
index 107cd16ec..107cd16ec 100644
--- a/template/yoga/icon/dec_period.png
+++ b/themes/default/icon/dec_period.png
diff --git a/template/yoga/icon/dec_period_unactive.png b/themes/default/icon/dec_period_unactive.png
index 5bc67affd..5bc67affd 100644
--- a/template/yoga/icon/dec_period_unactive.png
+++ b/themes/default/icon/dec_period_unactive.png
diff --git a/template/yoga/icon/del_all_favorites.png b/themes/default/icon/del_all_favorites.png
index cfc609749..cfc609749 100644
--- a/template/yoga/icon/del_all_favorites.png
+++ b/themes/default/icon/del_all_favorites.png
diff --git a/template/yoga/icon/del_favorite.png b/themes/default/icon/del_favorite.png
index cfc609749..cfc609749 100644
--- a/template/yoga/icon/del_favorite.png
+++ b/themes/default/icon/del_favorite.png
diff --git a/template/yoga/icon/delete.png b/themes/default/icon/delete.png
index af10be03e..af10be03e 100644
--- a/template/yoga/icon/delete.png
+++ b/themes/default/icon/delete.png
diff --git a/template/yoga/theme/Sylvia/icon/edit.png b/themes/default/icon/edit.png
index 9c755cda1..9c755cda1 100644
--- a/template/yoga/theme/Sylvia/icon/edit.png
+++ b/themes/default/icon/edit.png
diff --git a/template/yoga/icon/exit.png b/themes/default/icon/exit.png
index 2aafbb4cb..2aafbb4cb 100644
--- a/template/yoga/icon/exit.png
+++ b/themes/default/icon/exit.png
diff --git a/template/yoga/icon/favorite.png b/themes/default/icon/favorite.png
index 58befd9e3..58befd9e3 100644
--- a/template/yoga/icon/favorite.png
+++ b/themes/default/icon/favorite.png
diff --git a/template/yoga/icon/first.png b/themes/default/icon/first.png
index 2b8db1cff..2b8db1cff 100644
--- a/template/yoga/icon/first.png
+++ b/themes/default/icon/first.png
diff --git a/template/yoga/icon/first_unactive.png b/themes/default/icon/first_unactive.png
index f0c0364f2..f0c0364f2 100644
--- a/template/yoga/icon/first_unactive.png
+++ b/themes/default/icon/first_unactive.png
diff --git a/template/yoga/icon/flat.png b/themes/default/icon/flat.png
index 43584e825..43584e825 100644
--- a/template/yoga/icon/flat.png
+++ b/themes/default/icon/flat.png
diff --git a/template/yoga/icon/help.png b/themes/default/icon/help.png
index c76f68292..c76f68292 100644
--- a/template/yoga/icon/help.png
+++ b/themes/default/icon/help.png
diff --git a/template/yoga/icon/home.png b/themes/default/icon/home.png
index cce450d85..cce450d85 100644
--- a/template/yoga/icon/home.png
+++ b/themes/default/icon/home.png
diff --git a/template/yoga/icon/inc_period.png b/themes/default/icon/inc_period.png
index 28fef3d1b..28fef3d1b 100644
--- a/template/yoga/icon/inc_period.png
+++ b/themes/default/icon/inc_period.png
diff --git a/template/yoga/icon/inc_period_unactive.png b/themes/default/icon/inc_period_unactive.png
index f45507dce..f45507dce 100644
--- a/template/yoga/icon/inc_period_unactive.png
+++ b/themes/default/icon/inc_period_unactive.png
diff --git a/template/yoga/mail/text/html/images/index.php b/themes/default/icon/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/mail/text/html/images/index.php
+++ b/themes/default/icon/index.php
diff --git a/template/yoga/icon/last.png b/themes/default/icon/last.png
index 12e1367a7..12e1367a7 100644
--- a/template/yoga/icon/last.png
+++ b/themes/default/icon/last.png
diff --git a/template/yoga/icon/last_unactive.png b/themes/default/icon/last_unactive.png
index 90469d5c4..90469d5c4 100644
--- a/template/yoga/icon/last_unactive.png
+++ b/themes/default/icon/last_unactive.png
diff --git a/template/yoga/icon/left.png b/themes/default/icon/left.png
index 63d306c9c..63d306c9c 100644
--- a/template/yoga/icon/left.png
+++ b/themes/default/icon/left.png
diff --git a/template/yoga/icon/left_unactive.png b/themes/default/icon/left_unactive.png
index 0aefc64e4..0aefc64e4 100644
--- a/template/yoga/icon/left_unactive.png
+++ b/themes/default/icon/left_unactive.png
diff --git a/template/yoga/icon/lost_password.png b/themes/default/icon/lost_password.png
index ad6d71422..ad6d71422 100644
--- a/template/yoga/icon/lost_password.png
+++ b/themes/default/icon/lost_password.png
diff --git a/template/yoga/icon/metadata.png b/themes/default/icon/metadata.png
index d5d8fa6dc..d5d8fa6dc 100644
--- a/template/yoga/icon/metadata.png
+++ b/themes/default/icon/metadata.png
diff --git a/template/yoga/icon/mimetypes/avi.png b/themes/default/icon/mimetypes/avi.png
index 065f0b282..065f0b282 100644
--- a/template/yoga/icon/mimetypes/avi.png
+++ b/themes/default/icon/mimetypes/avi.png
diff --git a/template/yoga/mail/text/html/index.php b/themes/default/icon/mimetypes/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/mail/text/html/index.php
+++ b/themes/default/icon/mimetypes/index.php
diff --git a/template/yoga/icon/mimetypes/mp3.png b/themes/default/icon/mimetypes/mp3.png
index afb7e1b0a..afb7e1b0a 100644
--- a/template/yoga/icon/mimetypes/mp3.png
+++ b/themes/default/icon/mimetypes/mp3.png
diff --git a/template/yoga/icon/mimetypes/mpg.png b/themes/default/icon/mimetypes/mpg.png
index f7dbd2388..f7dbd2388 100644
--- a/template/yoga/icon/mimetypes/mpg.png
+++ b/themes/default/icon/mimetypes/mpg.png
diff --git a/template/yoga/icon/mimetypes/ogg.png b/themes/default/icon/mimetypes/ogg.png
index ead3f62c3..ead3f62c3 100644
--- a/template/yoga/icon/mimetypes/ogg.png
+++ b/themes/default/icon/mimetypes/ogg.png
diff --git a/template/yoga/icon/mimetypes/zip.png b/themes/default/icon/mimetypes/zip.png
index 1f08fe1a3..1f08fe1a3 100644
--- a/template/yoga/icon/mimetypes/zip.png
+++ b/themes/default/icon/mimetypes/zip.png
diff --git a/template/yoga/icon/normal_mode.png b/themes/default/icon/normal_mode.png
index 92d27a234..92d27a234 100644
--- a/template/yoga/icon/normal_mode.png
+++ b/themes/default/icon/normal_mode.png
diff --git a/template/yoga/icon/note.png b/themes/default/icon/note.png
index 5849f791b..5849f791b 100644
--- a/template/yoga/icon/note.png
+++ b/themes/default/icon/note.png
diff --git a/template/yoga/icon/pause.png b/themes/default/icon/pause.png
index 6a3928c51..6a3928c51 100644
--- a/template/yoga/icon/pause.png
+++ b/themes/default/icon/pause.png
diff --git a/template/yoga/icon/play.png b/themes/default/icon/play.png
index dfde7e96a..dfde7e96a 100644
--- a/template/yoga/icon/play.png
+++ b/themes/default/icon/play.png
diff --git a/template/yoga/icon/preferences.png b/themes/default/icon/preferences.png
index 0f3b619ed..0f3b619ed 100644
--- a/template/yoga/icon/preferences.png
+++ b/themes/default/icon/preferences.png
diff --git a/template/yoga/icon/rating-stars.gif b/themes/default/icon/rating-stars.gif
index 535443e06..535443e06 100644
--- a/template/yoga/icon/rating-stars.gif
+++ b/themes/default/icon/rating-stars.gif
diff --git a/template/yoga/icon/recent.png b/themes/default/icon/recent.png
index 78c1428ca..78c1428ca 100644
--- a/template/yoga/icon/recent.png
+++ b/themes/default/icon/recent.png
diff --git a/template/yoga/icon/recent_by_child.png b/themes/default/icon/recent_by_child.png
index 48e2b4bf7..48e2b4bf7 100644
--- a/template/yoga/icon/recent_by_child.png
+++ b/themes/default/icon/recent_by_child.png
diff --git a/template/yoga/icon/register.png b/themes/default/icon/register.png
index d1dd3c834..d1dd3c834 100644
--- a/template/yoga/icon/register.png
+++ b/themes/default/icon/register.png
diff --git a/template/yoga/icon/remove_s.png b/themes/default/icon/remove_s.png
index c78c38f17..c78c38f17 100644
--- a/template/yoga/icon/remove_s.png
+++ b/themes/default/icon/remove_s.png
diff --git a/template/yoga/icon/representative.png b/themes/default/icon/representative.png
index f1141d91b..f1141d91b 100644
--- a/template/yoga/icon/representative.png
+++ b/themes/default/icon/representative.png
diff --git a/template/yoga/icon/right.png b/themes/default/icon/right.png
index f998098e4..f998098e4 100644
--- a/template/yoga/icon/right.png
+++ b/themes/default/icon/right.png
diff --git a/template/yoga/icon/right_unactive.png b/themes/default/icon/right_unactive.png
index cf2f9614c..cf2f9614c 100644
--- a/template/yoga/icon/right_unactive.png
+++ b/themes/default/icon/right_unactive.png
diff --git a/template/yoga/icon/save.png b/themes/default/icon/save.png
index b4b9da08b..b4b9da08b 100644
--- a/template/yoga/icon/save.png
+++ b/themes/default/icon/save.png
diff --git a/template/yoga/icon/search_rules.png b/themes/default/icon/search_rules.png
index 300186647..300186647 100644
--- a/template/yoga/icon/search_rules.png
+++ b/themes/default/icon/search_rules.png
diff --git a/template/yoga/icon/start_filter.png b/themes/default/icon/start_filter.png
index 3d81a4d2e..3d81a4d2e 100644
--- a/template/yoga/icon/start_filter.png
+++ b/themes/default/icon/start_filter.png
diff --git a/template/yoga/icon/start_repeat.png b/themes/default/icon/start_repeat.png
index 74272979e..74272979e 100644
--- a/template/yoga/icon/start_repeat.png
+++ b/themes/default/icon/start_repeat.png
diff --git a/template/yoga/icon/start_slideshow.png b/themes/default/icon/start_slideshow.png
index 9733eb445..9733eb445 100644
--- a/template/yoga/icon/start_slideshow.png
+++ b/themes/default/icon/start_slideshow.png
diff --git a/template/yoga/icon/stop_filter.png b/themes/default/icon/stop_filter.png
index 1ff012e96..1ff012e96 100644
--- a/template/yoga/icon/stop_filter.png
+++ b/themes/default/icon/stop_filter.png
diff --git a/template/yoga/icon/stop_repeat.png b/themes/default/icon/stop_repeat.png
index f1cc1b564..f1cc1b564 100644
--- a/template/yoga/icon/stop_repeat.png
+++ b/themes/default/icon/stop_repeat.png
diff --git a/template/yoga/icon/stop_slideshow.png b/themes/default/icon/stop_slideshow.png
index 7b8d3ac26..7b8d3ac26 100644
--- a/template/yoga/icon/stop_slideshow.png
+++ b/themes/default/icon/stop_slideshow.png
diff --git a/template/yoga/icon/tag_cloud.png b/themes/default/icon/tag_cloud.png
index 79d7bc250..79d7bc250 100644
--- a/template/yoga/icon/tag_cloud.png
+++ b/themes/default/icon/tag_cloud.png
diff --git a/template/yoga/icon/tag_letters.png b/themes/default/icon/tag_letters.png
index d452db7ec..d452db7ec 100644
--- a/template/yoga/icon/tag_letters.png
+++ b/themes/default/icon/tag_letters.png
diff --git a/template/yoga/icon/up.png b/themes/default/icon/up.png
index 0c9cda5b1..0c9cda5b1 100644
--- a/template/yoga/icon/up.png
+++ b/themes/default/icon/up.png
diff --git a/template/yoga/icon/validate_s.png b/themes/default/icon/validate_s.png
index 400bf8a24..400bf8a24 100644
--- a/template/yoga/icon/validate_s.png
+++ b/themes/default/icon/validate_s.png
diff --git a/template/yoga/mail/text/index.php b/themes/default/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/mail/text/index.php
+++ b/themes/default/index.php
diff --git a/template-common/datepicker.js b/themes/default/js/datepicker.js
index 743cf65cd..743cf65cd 100644
--- a/template-common/datepicker.js
+++ b/themes/default/js/datepicker.js
diff --git a/template-common/lib/jquery.js b/themes/default/js/jquery.js
index 109701084..109701084 100644
--- a/template-common/lib/jquery.js
+++ b/themes/default/js/jquery.js
diff --git a/template-common/lib/jquery.packed.js b/themes/default/js/jquery.packed.js
index f99269ee9..f99269ee9 100644
--- a/template-common/lib/jquery.packed.js
+++ b/themes/default/js/jquery.packed.js
diff --git a/template-common/lib/jquery.tablednd.js b/themes/default/js/jquery.tablednd.js
index d4c9fec29..d4c9fec29 100644
--- a/template-common/lib/jquery.tablednd.js
+++ b/themes/default/js/jquery.tablednd.js
diff --git a/template-common/lib/plugins/jquery.autogrow-textarea.js b/themes/default/js/plugins/jquery.autogrow-textarea.js
index 2e85b98af..2e85b98af 100644
--- a/template-common/lib/plugins/jquery.autogrow-textarea.js
+++ b/themes/default/js/plugins/jquery.autogrow-textarea.js
diff --git a/template-common/lib/plugins/jquery.cluetip.js b/themes/default/js/plugins/jquery.cluetip.js
index 83727910c..83727910c 100644
--- a/template-common/lib/plugins/jquery.cluetip.js
+++ b/themes/default/js/plugins/jquery.cluetip.js
diff --git a/template-common/lib/plugins/jquery.cluetip.packed.js b/themes/default/js/plugins/jquery.cluetip.packed.js
index 99b15f30c..99b15f30c 100644
--- a/template-common/lib/plugins/jquery.cluetip.packed.js
+++ b/themes/default/js/plugins/jquery.cluetip.packed.js
diff --git a/template-common/lib/plugins/jquery.fcbkcomplete.js b/themes/default/js/plugins/jquery.fcbkcomplete.js
index 86b3b6ab2..86b3b6ab2 100644
--- a/template-common/lib/plugins/jquery.fcbkcomplete.js
+++ b/themes/default/js/plugins/jquery.fcbkcomplete.js
diff --git a/template-common/lib/plugins/jquery.tipTip.minified.js b/themes/default/js/plugins/jquery.tipTip.minified.js
index 62b7cfde0..62b7cfde0 100644
--- a/template-common/lib/plugins/jquery.tipTip.minified.js
+++ b/themes/default/js/plugins/jquery.tipTip.minified.js
diff --git a/template-common/pngfix.js b/themes/default/js/pngfix.js
index 549761a1d..549761a1d 100644
--- a/template-common/pngfix.js
+++ b/themes/default/js/pngfix.js
diff --git a/template/yoga/rating.js b/themes/default/js/rating.js
index 9b8370e93..9b8370e93 100644
--- a/template/yoga/rating.js
+++ b/themes/default/js/rating.js
diff --git a/template-common/scripts.js b/themes/default/js/scripts.js
index d4595435b..d4595435b 100644
--- a/template-common/scripts.js
+++ b/themes/default/js/scripts.js
diff --git a/template-common/lib/ui/effects.blind.js b/themes/default/js/ui/effects.blind.js
index 62d86ef14..62d86ef14 100644
--- a/template-common/lib/ui/effects.blind.js
+++ b/themes/default/js/ui/effects.blind.js
diff --git a/template-common/lib/ui/effects.bounce.js b/themes/default/js/ui/effects.bounce.js
index 646133261..646133261 100644
--- a/template-common/lib/ui/effects.bounce.js
+++ b/themes/default/js/ui/effects.bounce.js
diff --git a/template-common/lib/ui/effects.clip.js b/themes/default/js/ui/effects.clip.js
index 1775f8359..1775f8359 100644
--- a/template-common/lib/ui/effects.clip.js
+++ b/themes/default/js/ui/effects.clip.js
diff --git a/template-common/lib/ui/effects.core.js b/themes/default/js/ui/effects.core.js
index efd0d50b0..efd0d50b0 100644
--- a/template-common/lib/ui/effects.core.js
+++ b/themes/default/js/ui/effects.core.js
diff --git a/template-common/lib/ui/effects.drop.js b/themes/default/js/ui/effects.drop.js
index 604ac8d8b..604ac8d8b 100644
--- a/template-common/lib/ui/effects.drop.js
+++ b/themes/default/js/ui/effects.drop.js
diff --git a/template-common/lib/ui/effects.explode.js b/themes/default/js/ui/effects.explode.js
index 31efd2f54..31efd2f54 100644
--- a/template-common/lib/ui/effects.explode.js
+++ b/themes/default/js/ui/effects.explode.js
diff --git a/template-common/lib/ui/effects.fold.js b/themes/default/js/ui/effects.fold.js
index 5ed1188f6..5ed1188f6 100644
--- a/template-common/lib/ui/effects.fold.js
+++ b/themes/default/js/ui/effects.fold.js
diff --git a/template-common/lib/ui/effects.highlight.js b/themes/default/js/ui/effects.highlight.js
index 828d059ab..828d059ab 100644
--- a/template-common/lib/ui/effects.highlight.js
+++ b/themes/default/js/ui/effects.highlight.js
diff --git a/template-common/lib/ui/effects.pulsate.js b/themes/default/js/ui/effects.pulsate.js
index 6459d1868..6459d1868 100644
--- a/template-common/lib/ui/effects.pulsate.js
+++ b/themes/default/js/ui/effects.pulsate.js
diff --git a/template-common/lib/ui/effects.scale.js b/themes/default/js/ui/effects.scale.js
index ec15cf853..ec15cf853 100644
--- a/template-common/lib/ui/effects.scale.js
+++ b/themes/default/js/ui/effects.scale.js
diff --git a/template-common/lib/ui/effects.shake.js b/themes/default/js/ui/effects.shake.js
index dc9f59710..dc9f59710 100644
--- a/template-common/lib/ui/effects.shake.js
+++ b/themes/default/js/ui/effects.shake.js
diff --git a/template-common/lib/ui/effects.slide.js b/themes/default/js/ui/effects.slide.js
index 350f599e9..350f599e9 100644
--- a/template-common/lib/ui/effects.slide.js
+++ b/themes/default/js/ui/effects.slide.js
diff --git a/template-common/lib/ui/effects.transfer.js b/themes/default/js/ui/effects.transfer.js
index 82bab6d89..82bab6d89 100644
--- a/template-common/lib/ui/effects.transfer.js
+++ b/themes/default/js/ui/effects.transfer.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-ar.js b/themes/default/js/ui/i18n/ui.datepicker-ar.js
index b60587891..b60587891 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-ar.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-ar.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-bg.js b/themes/default/js/ui/i18n/ui.datepicker-bg.js
index a73884ef2..a73884ef2 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-bg.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-bg.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-ca.js b/themes/default/js/ui/i18n/ui.datepicker-ca.js
index ad47af0bb..ad47af0bb 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-ca.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-ca.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-cs.js b/themes/default/js/ui/i18n/ui.datepicker-cs.js
index 334ae2f46..334ae2f46 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-cs.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-cs.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-da.js b/themes/default/js/ui/i18n/ui.datepicker-da.js
index 8ad1e2cc3..8ad1e2cc3 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-da.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-da.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-de.js b/themes/default/js/ui/i18n/ui.datepicker-de.js
index f9299c815..f9299c815 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-de.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-de.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-es.js b/themes/default/js/ui/i18n/ui.datepicker-es.js
index 0a699afe7..0a699afe7 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-es.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-es.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-fi.js b/themes/default/js/ui/i18n/ui.datepicker-fi.js
index 3a0943fd7..3a0943fd7 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-fi.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-fi.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-fr.js b/themes/default/js/ui/i18n/ui.datepicker-fr.js
index 02edda29d..02edda29d 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-fr.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-fr.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-he.js b/themes/default/js/ui/i18n/ui.datepicker-he.js
index 38e0a03e2..38e0a03e2 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-he.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-he.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-hu.js b/themes/default/js/ui/i18n/ui.datepicker-hu.js
index ee102acd0..ee102acd0 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-hu.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-hu.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-hy.js b/themes/default/js/ui/i18n/ui.datepicker-hy.js
index 1ffbeaae0..1ffbeaae0 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-hy.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-hy.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-id.js b/themes/default/js/ui/i18n/ui.datepicker-id.js
index e5246c85d..e5246c85d 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-id.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-id.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-is.js b/themes/default/js/ui/i18n/ui.datepicker-is.js
index 68c1a07d4..68c1a07d4 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-is.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-is.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-it.js b/themes/default/js/ui/i18n/ui.datepicker-it.js
index f3e691e5e..f3e691e5e 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-it.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-it.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-ja.js b/themes/default/js/ui/i18n/ui.datepicker-ja.js
index a6a5f45ce..a6a5f45ce 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-ja.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-ja.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-ko.js b/themes/default/js/ui/i18n/ui.datepicker-ko.js
index 53ede9142..53ede9142 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-ko.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-ko.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-lt.js b/themes/default/js/ui/i18n/ui.datepicker-lt.js
index a8a6aa1a4..a8a6aa1a4 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-lt.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-lt.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-lv.js b/themes/default/js/ui/i18n/ui.datepicker-lv.js
index 12c32f83c..12c32f83c 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-lv.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-lv.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-nl.js b/themes/default/js/ui/i18n/ui.datepicker-nl.js
index 938dc5ef6..938dc5ef6 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-nl.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-nl.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-no.js b/themes/default/js/ui/i18n/ui.datepicker-no.js
index d81f6bb2e..d81f6bb2e 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-no.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-no.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-pl.js b/themes/default/js/ui/i18n/ui.datepicker-pl.js
index 0ce38bea8..0ce38bea8 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-pl.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-pl.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-pt-BR.js b/themes/default/js/ui/i18n/ui.datepicker-pt-BR.js
index e3ac652b3..e3ac652b3 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-pt-BR.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-pt-BR.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-ro.js b/themes/default/js/ui/i18n/ui.datepicker-ro.js
index ec4033cc7..ec4033cc7 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-ro.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-ro.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-ru.js b/themes/default/js/ui/i18n/ui.datepicker-ru.js
index 62752c7f5..62752c7f5 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-ru.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-ru.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-sk.js b/themes/default/js/ui/i18n/ui.datepicker-sk.js
index a023ffa77..a023ffa77 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-sk.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-sk.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-sv.js b/themes/default/js/ui/i18n/ui.datepicker-sv.js
index 47c4b24e4..47c4b24e4 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-sv.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-sv.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-th.js b/themes/default/js/ui/i18n/ui.datepicker-th.js
index 3c2a02b5e..3c2a02b5e 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-th.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-th.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-tr.js b/themes/default/js/ui/i18n/ui.datepicker-tr.js
index 5817b2ac0..5817b2ac0 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-tr.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-tr.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-uk.js b/themes/default/js/ui/i18n/ui.datepicker-uk.js
index 1043d7cd8..1043d7cd8 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-uk.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-uk.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-zh-CN.js b/themes/default/js/ui/i18n/ui.datepicker-zh-CN.js
index e3a69dc6d..e3a69dc6d 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-zh-CN.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-zh-CN.js
diff --git a/template-common/lib/ui/i18n/ui.datepicker-zh-TW.js b/themes/default/js/ui/i18n/ui.datepicker-zh-TW.js
index 9cb49b72b..9cb49b72b 100644
--- a/template-common/lib/ui/i18n/ui.datepicker-zh-TW.js
+++ b/themes/default/js/ui/i18n/ui.datepicker-zh-TW.js
diff --git a/template-common/lib/ui/jquery.ui.all.js b/themes/default/js/ui/jquery.ui.all.js
index cf19f30a9..cf19f30a9 100644
--- a/template-common/lib/ui/jquery.ui.all.js
+++ b/themes/default/js/ui/jquery.ui.all.js
diff --git a/template-common/lib/ui/minified/effects.blind.min.js b/themes/default/js/ui/minified/effects.blind.min.js
index 42694154e..42694154e 100644
--- a/template-common/lib/ui/minified/effects.blind.min.js
+++ b/themes/default/js/ui/minified/effects.blind.min.js
diff --git a/template-common/lib/ui/minified/effects.bounce.min.js b/themes/default/js/ui/minified/effects.bounce.min.js
index 083aefff2..083aefff2 100644
--- a/template-common/lib/ui/minified/effects.bounce.min.js
+++ b/themes/default/js/ui/minified/effects.bounce.min.js
diff --git a/template-common/lib/ui/minified/effects.clip.min.js b/themes/default/js/ui/minified/effects.clip.min.js
index 3ee699912..3ee699912 100644
--- a/template-common/lib/ui/minified/effects.clip.min.js
+++ b/themes/default/js/ui/minified/effects.clip.min.js
diff --git a/template-common/lib/ui/minified/effects.core.min.js b/themes/default/js/ui/minified/effects.core.min.js
index 4b6203057..4b6203057 100644
--- a/template-common/lib/ui/minified/effects.core.min.js
+++ b/themes/default/js/ui/minified/effects.core.min.js
diff --git a/template-common/lib/ui/minified/effects.drop.min.js b/themes/default/js/ui/minified/effects.drop.min.js
index ba3544ee4..ba3544ee4 100644
--- a/template-common/lib/ui/minified/effects.drop.min.js
+++ b/themes/default/js/ui/minified/effects.drop.min.js
diff --git a/template-common/lib/ui/minified/effects.explode.min.js b/themes/default/js/ui/minified/effects.explode.min.js
index 89e6f528e..89e6f528e 100644
--- a/template-common/lib/ui/minified/effects.explode.min.js
+++ b/themes/default/js/ui/minified/effects.explode.min.js
diff --git a/template-common/lib/ui/minified/effects.fold.min.js b/themes/default/js/ui/minified/effects.fold.min.js
index bbe9846e8..bbe9846e8 100644
--- a/template-common/lib/ui/minified/effects.fold.min.js
+++ b/themes/default/js/ui/minified/effects.fold.min.js
diff --git a/template-common/lib/ui/minified/effects.highlight.min.js b/themes/default/js/ui/minified/effects.highlight.min.js
index bc20b6eea..bc20b6eea 100644
--- a/template-common/lib/ui/minified/effects.highlight.min.js
+++ b/themes/default/js/ui/minified/effects.highlight.min.js
diff --git a/template-common/lib/ui/minified/effects.pulsate.min.js b/themes/default/js/ui/minified/effects.pulsate.min.js
index e1e49b0fa..e1e49b0fa 100644
--- a/template-common/lib/ui/minified/effects.pulsate.min.js
+++ b/themes/default/js/ui/minified/effects.pulsate.min.js
diff --git a/template-common/lib/ui/minified/effects.scale.min.js b/themes/default/js/ui/minified/effects.scale.min.js
index 5b6a336eb..5b6a336eb 100644
--- a/template-common/lib/ui/minified/effects.scale.min.js
+++ b/themes/default/js/ui/minified/effects.scale.min.js
diff --git a/template-common/lib/ui/minified/effects.shake.min.js b/themes/default/js/ui/minified/effects.shake.min.js
index fd035edc9..fd035edc9 100644
--- a/template-common/lib/ui/minified/effects.shake.min.js
+++ b/themes/default/js/ui/minified/effects.shake.min.js
diff --git a/template-common/lib/ui/minified/effects.slide.min.js b/themes/default/js/ui/minified/effects.slide.min.js
index db1b24edc..db1b24edc 100644
--- a/template-common/lib/ui/minified/effects.slide.min.js
+++ b/themes/default/js/ui/minified/effects.slide.min.js
diff --git a/template-common/lib/ui/minified/effects.transfer.min.js b/themes/default/js/ui/minified/effects.transfer.min.js
index 64096cb67..64096cb67 100644
--- a/template-common/lib/ui/minified/effects.transfer.min.js
+++ b/themes/default/js/ui/minified/effects.transfer.min.js
diff --git a/template-common/lib/ui/minified/ui.accordion.min.js b/themes/default/js/ui/minified/ui.accordion.min.js
index e656881d3..e656881d3 100644
--- a/template-common/lib/ui/minified/ui.accordion.min.js
+++ b/themes/default/js/ui/minified/ui.accordion.min.js
diff --git a/template-common/lib/ui/minified/ui.core.min.js b/themes/default/js/ui/minified/ui.core.min.js
index 633465af5..633465af5 100644
--- a/template-common/lib/ui/minified/ui.core.min.js
+++ b/themes/default/js/ui/minified/ui.core.min.js
diff --git a/template-common/lib/ui/minified/ui.datepicker.min.js b/themes/default/js/ui/minified/ui.datepicker.min.js
index ea2c13daf..ea2c13daf 100644
--- a/template-common/lib/ui/minified/ui.datepicker.min.js
+++ b/themes/default/js/ui/minified/ui.datepicker.min.js
diff --git a/template-common/lib/ui/minified/ui.dialog.min.js b/themes/default/js/ui/minified/ui.dialog.min.js
index dac92ce8b..dac92ce8b 100644
--- a/template-common/lib/ui/minified/ui.dialog.min.js
+++ b/themes/default/js/ui/minified/ui.dialog.min.js
diff --git a/template-common/lib/ui/minified/ui.draggable.min.js b/themes/default/js/ui/minified/ui.draggable.min.js
index 9f43db60b..9f43db60b 100644
--- a/template-common/lib/ui/minified/ui.draggable.min.js
+++ b/themes/default/js/ui/minified/ui.draggable.min.js
diff --git a/template-common/lib/ui/minified/ui.droppable.min.js b/themes/default/js/ui/minified/ui.droppable.min.js
index bd984b121..bd984b121 100644
--- a/template-common/lib/ui/minified/ui.droppable.min.js
+++ b/themes/default/js/ui/minified/ui.droppable.min.js
diff --git a/template-common/lib/ui/minified/ui.resizable.min.js b/themes/default/js/ui/minified/ui.resizable.min.js
index ee688bcf0..ee688bcf0 100644
--- a/template-common/lib/ui/minified/ui.resizable.min.js
+++ b/themes/default/js/ui/minified/ui.resizable.min.js
diff --git a/template-common/lib/ui/minified/ui.selectable.min.js b/themes/default/js/ui/minified/ui.selectable.min.js
index b63f55a44..b63f55a44 100644
--- a/template-common/lib/ui/minified/ui.selectable.min.js
+++ b/themes/default/js/ui/minified/ui.selectable.min.js
diff --git a/template-common/lib/ui/minified/ui.slider.min.js b/themes/default/js/ui/minified/ui.slider.min.js
index 209d8338f..209d8338f 100644
--- a/template-common/lib/ui/minified/ui.slider.min.js
+++ b/themes/default/js/ui/minified/ui.slider.min.js
diff --git a/template-common/lib/ui/minified/ui.sortable.min.js b/themes/default/js/ui/minified/ui.sortable.min.js
index 4c4c87265..4c4c87265 100644
--- a/template-common/lib/ui/minified/ui.sortable.min.js
+++ b/themes/default/js/ui/minified/ui.sortable.min.js
diff --git a/template-common/lib/ui/minified/ui.tabs.min.js b/themes/default/js/ui/minified/ui.tabs.min.js
index 39e8edae9..39e8edae9 100644
--- a/template-common/lib/ui/minified/ui.tabs.min.js
+++ b/themes/default/js/ui/minified/ui.tabs.min.js
diff --git a/template-common/lib/ui/packed/effects.blind.packed.js b/themes/default/js/ui/packed/effects.blind.packed.js
index 47c1f6ee4..47c1f6ee4 100644
--- a/template-common/lib/ui/packed/effects.blind.packed.js
+++ b/themes/default/js/ui/packed/effects.blind.packed.js
diff --git a/template-common/lib/ui/packed/effects.bounce.packed.js b/themes/default/js/ui/packed/effects.bounce.packed.js
index d1cc78c04..d1cc78c04 100644
--- a/template-common/lib/ui/packed/effects.bounce.packed.js
+++ b/themes/default/js/ui/packed/effects.bounce.packed.js
diff --git a/template-common/lib/ui/packed/effects.clip.packed.js b/themes/default/js/ui/packed/effects.clip.packed.js
index 925218295..925218295 100644
--- a/template-common/lib/ui/packed/effects.clip.packed.js
+++ b/themes/default/js/ui/packed/effects.clip.packed.js
diff --git a/template-common/lib/ui/packed/effects.core.packed.js b/themes/default/js/ui/packed/effects.core.packed.js
index 9d13af062..9d13af062 100644
--- a/template-common/lib/ui/packed/effects.core.packed.js
+++ b/themes/default/js/ui/packed/effects.core.packed.js
diff --git a/template-common/lib/ui/packed/effects.drop.packed.js b/themes/default/js/ui/packed/effects.drop.packed.js
index ff9373d35..ff9373d35 100644
--- a/template-common/lib/ui/packed/effects.drop.packed.js
+++ b/themes/default/js/ui/packed/effects.drop.packed.js
diff --git a/template-common/lib/ui/packed/effects.explode.packed.js b/themes/default/js/ui/packed/effects.explode.packed.js
index d82346710..d82346710 100644
--- a/template-common/lib/ui/packed/effects.explode.packed.js
+++ b/themes/default/js/ui/packed/effects.explode.packed.js
diff --git a/template-common/lib/ui/packed/effects.fold.packed.js b/themes/default/js/ui/packed/effects.fold.packed.js
index 35d4a4170..35d4a4170 100644
--- a/template-common/lib/ui/packed/effects.fold.packed.js
+++ b/themes/default/js/ui/packed/effects.fold.packed.js
diff --git a/template-common/lib/ui/packed/effects.highlight.packed.js b/themes/default/js/ui/packed/effects.highlight.packed.js
index 523849a2e..523849a2e 100644
--- a/template-common/lib/ui/packed/effects.highlight.packed.js
+++ b/themes/default/js/ui/packed/effects.highlight.packed.js
diff --git a/template-common/lib/ui/packed/effects.pulsate.packed.js b/themes/default/js/ui/packed/effects.pulsate.packed.js
index 895b7b22d..895b7b22d 100644
--- a/template-common/lib/ui/packed/effects.pulsate.packed.js
+++ b/themes/default/js/ui/packed/effects.pulsate.packed.js
diff --git a/template-common/lib/ui/packed/effects.scale.packed.js b/themes/default/js/ui/packed/effects.scale.packed.js
index 8ec5fb862..8ec5fb862 100644
--- a/template-common/lib/ui/packed/effects.scale.packed.js
+++ b/themes/default/js/ui/packed/effects.scale.packed.js
diff --git a/template-common/lib/ui/packed/effects.shake.packed.js b/themes/default/js/ui/packed/effects.shake.packed.js
index 27087ba2c..27087ba2c 100644
--- a/template-common/lib/ui/packed/effects.shake.packed.js
+++ b/themes/default/js/ui/packed/effects.shake.packed.js
diff --git a/template-common/lib/ui/packed/effects.slide.packed.js b/themes/default/js/ui/packed/effects.slide.packed.js
index c4559bfd8..c4559bfd8 100644
--- a/template-common/lib/ui/packed/effects.slide.packed.js
+++ b/themes/default/js/ui/packed/effects.slide.packed.js
diff --git a/template-common/lib/ui/packed/effects.transfer.packed.js b/themes/default/js/ui/packed/effects.transfer.packed.js
index 284fcf37b..284fcf37b 100644
--- a/template-common/lib/ui/packed/effects.transfer.packed.js
+++ b/themes/default/js/ui/packed/effects.transfer.packed.js
diff --git a/template-common/lib/ui/packed/ui.accordion.packed.js b/themes/default/js/ui/packed/ui.accordion.packed.js
index bf3a65504..bf3a65504 100644
--- a/template-common/lib/ui/packed/ui.accordion.packed.js
+++ b/themes/default/js/ui/packed/ui.accordion.packed.js
diff --git a/template-common/lib/ui/packed/ui.core.packed.js b/themes/default/js/ui/packed/ui.core.packed.js
index eab7ba37c..eab7ba37c 100644
--- a/template-common/lib/ui/packed/ui.core.packed.js
+++ b/themes/default/js/ui/packed/ui.core.packed.js
diff --git a/template-common/lib/ui/packed/ui.datepicker.packed.js b/themes/default/js/ui/packed/ui.datepicker.packed.js
index 3aa592136..3aa592136 100644
--- a/template-common/lib/ui/packed/ui.datepicker.packed.js
+++ b/themes/default/js/ui/packed/ui.datepicker.packed.js
diff --git a/template-common/lib/ui/packed/ui.dialog.packed.js b/themes/default/js/ui/packed/ui.dialog.packed.js
index cd10d9f1b..cd10d9f1b 100644
--- a/template-common/lib/ui/packed/ui.dialog.packed.js
+++ b/themes/default/js/ui/packed/ui.dialog.packed.js
diff --git a/template-common/lib/ui/packed/ui.draggable.packed.js b/themes/default/js/ui/packed/ui.draggable.packed.js
index e2ddd379e..e2ddd379e 100644
--- a/template-common/lib/ui/packed/ui.draggable.packed.js
+++ b/themes/default/js/ui/packed/ui.draggable.packed.js
diff --git a/template-common/lib/ui/packed/ui.droppable.packed.js b/themes/default/js/ui/packed/ui.droppable.packed.js
index 496e477f0..496e477f0 100644
--- a/template-common/lib/ui/packed/ui.droppable.packed.js
+++ b/themes/default/js/ui/packed/ui.droppable.packed.js
diff --git a/template-common/lib/ui/packed/ui.resizable.packed.js b/themes/default/js/ui/packed/ui.resizable.packed.js
index f54998ba4..f54998ba4 100644
--- a/template-common/lib/ui/packed/ui.resizable.packed.js
+++ b/themes/default/js/ui/packed/ui.resizable.packed.js
diff --git a/template-common/lib/ui/packed/ui.selectable.packed.js b/themes/default/js/ui/packed/ui.selectable.packed.js
index a397c5184..a397c5184 100644
--- a/template-common/lib/ui/packed/ui.selectable.packed.js
+++ b/themes/default/js/ui/packed/ui.selectable.packed.js
diff --git a/template-common/lib/ui/packed/ui.slider.packed.js b/themes/default/js/ui/packed/ui.slider.packed.js
index 9d269f0c1..9d269f0c1 100644
--- a/template-common/lib/ui/packed/ui.slider.packed.js
+++ b/themes/default/js/ui/packed/ui.slider.packed.js
diff --git a/template-common/lib/ui/packed/ui.sortable.packed.js b/themes/default/js/ui/packed/ui.sortable.packed.js
index 668e8803d..668e8803d 100644
--- a/template-common/lib/ui/packed/ui.sortable.packed.js
+++ b/themes/default/js/ui/packed/ui.sortable.packed.js
diff --git a/template-common/lib/ui/packed/ui.tabs.packed.js b/themes/default/js/ui/packed/ui.tabs.packed.js
index 20da11c44..20da11c44 100644
--- a/template-common/lib/ui/packed/ui.tabs.packed.js
+++ b/themes/default/js/ui/packed/ui.tabs.packed.js
diff --git a/template-common/lib/ui/theme/ui.datepicker.css b/themes/default/js/ui/theme/ui.datepicker.css
index 567f8c97b..567f8c97b 100644
--- a/template-common/lib/ui/theme/ui.datepicker.css
+++ b/themes/default/js/ui/theme/ui.datepicker.css
diff --git a/template-common/lib/ui/ui.accordion.js b/themes/default/js/ui/ui.accordion.js
index e469c3a61..e469c3a61 100644
--- a/template-common/lib/ui/ui.accordion.js
+++ b/themes/default/js/ui/ui.accordion.js
diff --git a/template-common/lib/ui/ui.core.js b/themes/default/js/ui/ui.core.js
index 5493e0aeb..5493e0aeb 100644
--- a/template-common/lib/ui/ui.core.js
+++ b/themes/default/js/ui/ui.core.js
diff --git a/template-common/lib/ui/ui.datepicker.js b/themes/default/js/ui/ui.datepicker.js
index 0ce166efd..0ce166efd 100644
--- a/template-common/lib/ui/ui.datepicker.js
+++ b/themes/default/js/ui/ui.datepicker.js
diff --git a/template-common/lib/ui/ui.dialog.js b/themes/default/js/ui/ui.dialog.js
index fdd5b26df..fdd5b26df 100644
--- a/template-common/lib/ui/ui.dialog.js
+++ b/themes/default/js/ui/ui.dialog.js
diff --git a/template-common/lib/ui/ui.draggable.js b/themes/default/js/ui/ui.draggable.js
index 0402f0e5c..0402f0e5c 100644
--- a/template-common/lib/ui/ui.draggable.js
+++ b/themes/default/js/ui/ui.draggable.js
diff --git a/template-common/lib/ui/ui.droppable.js b/themes/default/js/ui/ui.droppable.js
index 8e7be33c5..8e7be33c5 100644
--- a/template-common/lib/ui/ui.droppable.js
+++ b/themes/default/js/ui/ui.droppable.js
diff --git a/template-common/lib/ui/ui.resizable.js b/themes/default/js/ui/ui.resizable.js
index 6172d6cb8..6172d6cb8 100644
--- a/template-common/lib/ui/ui.resizable.js
+++ b/themes/default/js/ui/ui.resizable.js
diff --git a/template-common/lib/ui/ui.selectable.js b/themes/default/js/ui/ui.selectable.js
index 08f99cf4a..08f99cf4a 100644
--- a/template-common/lib/ui/ui.selectable.js
+++ b/themes/default/js/ui/ui.selectable.js
diff --git a/template-common/lib/ui/ui.slider.js b/themes/default/js/ui/ui.slider.js
index f466a69b2..f466a69b2 100644
--- a/template-common/lib/ui/ui.slider.js
+++ b/themes/default/js/ui/ui.slider.js
diff --git a/template-common/lib/ui/ui.sortable.js b/themes/default/js/ui/ui.sortable.js
index 5460850b4..5460850b4 100644
--- a/template-common/lib/ui/ui.sortable.js
+++ b/themes/default/js/ui/ui.sortable.js
diff --git a/template-common/lib/ui/ui.tabs.js b/themes/default/js/ui/ui.tabs.js
index d914b3e4f..d914b3e4f 100644
--- a/template-common/lib/ui/ui.tabs.js
+++ b/themes/default/js/ui/ui.tabs.js
diff --git a/template/yoga/layout.css b/themes/default/layout.css
index d12ecbacc..d12ecbacc 100644
--- a/template/yoga/layout.css
+++ b/themes/default/layout.css
diff --git a/template/yoga/mail/text/plain/index.php b/themes/default/mail/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/mail/text/plain/index.php
+++ b/themes/default/mail/index.php
diff --git a/template/yoga/mail/text/html/images/footer-bg.jpg b/themes/default/mail/text/html/images/footer-bg.jpg
index 3d8a5eed2..3d8a5eed2 100644
--- a/template/yoga/mail/text/html/images/footer-bg.jpg
+++ b/themes/default/mail/text/html/images/footer-bg.jpg
diff --git a/template/yoga/mail/text/html/images/footer-bg.png b/themes/default/mail/text/html/images/footer-bg.png
index fd3c2925f..fd3c2925f 100644
--- a/template/yoga/mail/text/html/images/footer-bg.png
+++ b/themes/default/mail/text/html/images/footer-bg.png
diff --git a/template/yoga/mail/text/html/images/header-bg.png b/themes/default/mail/text/html/images/header-bg.png
index 1770a3ddc..1770a3ddc 100644
--- a/template/yoga/mail/text/html/images/header-bg.png
+++ b/themes/default/mail/text/html/images/header-bg.png
diff --git a/template/yoga/theme/Sylvia/icon/index.php b/themes/default/mail/text/html/images/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/Sylvia/icon/index.php
+++ b/themes/default/mail/text/html/images/index.php
diff --git a/template/yoga/mail/text/html/images/mailbody-bg.png b/themes/default/mail/text/html/images/mailbody-bg.png
index 722a24f63..722a24f63 100644
--- a/template/yoga/mail/text/html/images/mailbody-bg.png
+++ b/themes/default/mail/text/html/images/mailbody-bg.png
diff --git a/template/yoga/theme/Sylvia/icon/mimetypes/index.php b/themes/default/mail/text/html/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/Sylvia/icon/mimetypes/index.php
+++ b/themes/default/mail/text/html/index.php
diff --git a/template/yoga/theme/Sylvia/index.php b/themes/default/mail/text/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/Sylvia/index.php
+++ b/themes/default/mail/text/index.php
diff --git a/template/yoga/theme/clear/index.php b/themes/default/mail/text/plain/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/clear/index.php
+++ b/themes/default/mail/text/plain/index.php
diff --git a/template/yoga/menubar.css b/themes/default/menubar.css
index 27eb1ac38..27eb1ac38 100644
--- a/template/yoga/menubar.css
+++ b/themes/default/menubar.css
diff --git a/template/yoga/not-ie.css b/themes/default/not-ie.css
index c5bd7adef..c5bd7adef 100644
--- a/template/yoga/not-ie.css
+++ b/themes/default/not-ie.css
diff --git a/template/yoga/picture.css b/themes/default/picture.css
index ef2f23213..ef2f23213 100644
--- a/template/yoga/picture.css
+++ b/themes/default/picture.css
diff --git a/template/yoga/print.css b/themes/default/print.css
index 8252f7e44..8252f7e44 100644
--- a/template/yoga/print.css
+++ b/themes/default/print.css
diff --git a/template/default/about.tpl b/themes/default/template/about.tpl
index 370e3ccc3..370e3ccc3 100644
--- a/template/default/about.tpl
+++ b/themes/default/template/about.tpl
diff --git a/template/default/comment_list.tpl b/themes/default/template/comment_list.tpl
index f431a1cd5..f431a1cd5 100644
--- a/template/default/comment_list.tpl
+++ b/themes/default/template/comment_list.tpl
diff --git a/template/default/comments.tpl b/themes/default/template/comments.tpl
index 68941e03d..68941e03d 100644
--- a/template/default/comments.tpl
+++ b/themes/default/template/comments.tpl
diff --git a/template/default/footer.tpl b/themes/default/template/footer.tpl
index 89c034965..89c034965 100644
--- a/template/default/footer.tpl
+++ b/themes/default/template/footer.tpl
diff --git a/template/default/header.tpl b/themes/default/template/header.tpl
index 74bc82b13..07c020405 100644
--- a/template/default/header.tpl
+++ b/themes/default/template/header.tpl
@@ -20,7 +20,7 @@
 {if (isset($REVERSE) and $REVERSE and $PAGE_TITLE == l10n('home'))}
 <title>{$GALLERY_TITLE} | {$PAGE_TITLE}</title>{else}
 <title>{$PAGE_TITLE} | {$GALLERY_TITLE}</title>{/if}
-<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
+<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico">
 
 <link rel="start" title="{'Home'|@translate}" href="{$U_HOME}" >
 <link rel="search" title="{'Search'|@translate}" href="{$ROOT_URL}search.php" >
@@ -30,36 +30,18 @@
 {if isset($last.U_IMG)    }<link rel="last" title="{'Last'|@translate}" href="{$last.U_IMG}" >{/if}
 {if isset($U_UP)          }<link rel="up" title="{'Thumbnails'|@translate}" href="{$U_UP}" >{/if}
 
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/layout.css">
-{* the next css is used to fix khtml (Konqueror/Safari) issue the "text/nonsense" prevents gecko based browsers to load it *}
-<link rel="stylesheet" type="text/nonsense" href="{$ROOT_URL}template/{$themeconf.template}/fix-khtml.css">
-<!--[if lt IE 7]>
-	<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/fix-ie5-ie6.css">
-<![endif]-->
-<!--[if gt IE 6]>
-	<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/fix-ie7.css">
-<![endif]-->
-<!--[if !IE]> <-->
-	<link rel="stylesheet" href="{$ROOT_URL}template/{$themeconf.template}/not-ie.css" type="text/css">
-<!--> <![endif]-->
-<link rel="stylesheet" type="text/css" media="print" href="{$ROOT_URL}template/{$themeconf.template}/print.css">
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
-{$themeconf.local_head}
+{foreach from=$themes item=theme}
+{if isset($theme.local_head)}{include file=$theme.local_head}{/if}
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.name}/theme.css">
+{/foreach}
+
 {if isset($U_PREFETCH)          }<link rel="prefetch" href="{$U_PREFETCH}">{/if}
 
 {if not empty($page_refresh)    }<meta http-equiv="refresh" content="{$page_refresh.TIME};url={$page_refresh.U_REFRESH}">{/if}
 
-<script type="text/javascript" src="{$ROOT_URL}template-common/scripts.js"></script>
+<script type="text/javascript" src="{$ROOT_URL}{$themeconf.js_dir}/scripts.js"></script>
 <!--[if lt IE 7]>
-<style>
-	{* only because we need {$ROOT_URL} otherwise use fix-ie5-ie6.css *}
-	BODY {ldelim} behavior:url("{$ROOT_URL}template-common/csshover.htc"); }
-	A IMG, .button, .icon {ldelim}
-		behavior:url("{$ROOT_URL}template-common/tooltipfix.htc");
-	}
-	FORM {ldelim} behavior: url("{$ROOT_URL}template-common/inputfix.htc"); }
-</style>
-<script type="text/javascript" src="{$ROOT_URL}template-common/pngfix.js"></script>
+<script type="text/javascript" src="{$ROOT_URL}{$themeconf.js_dir}/pngfix.js"></script>
 <![endif]-->
 
 {if not empty($head_elements)}
diff --git a/template/default/identification.tpl b/themes/default/template/identification.tpl
index b63415e7b..b63415e7b 100644
--- a/template/default/identification.tpl
+++ b/themes/default/template/identification.tpl
diff --git a/template/default/index.tpl b/themes/default/template/index.tpl
index 6bad8e319..6bad8e319 100644
--- a/template/default/index.tpl
+++ b/themes/default/template/index.tpl
diff --git a/template/yoga/theme/dark/images/index.php b/themes/default/template/mail/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/dark/images/index.php
+++ b/themes/default/template/mail/index.php
diff --git a/template/default/mail/text/html/cat_group_info.tpl b/themes/default/template/mail/text/html/cat_group_info.tpl
index a0c703bb0..a0c703bb0 100644
--- a/template/default/mail/text/html/cat_group_info.tpl
+++ b/themes/default/template/mail/text/html/cat_group_info.tpl
diff --git a/template/default/mail/text/html/footer.tpl b/themes/default/template/mail/text/html/footer.tpl
index 92e69b089..92e69b089 100644
--- a/template/default/mail/text/html/footer.tpl
+++ b/themes/default/template/mail/text/html/footer.tpl
diff --git a/template/default/mail/text/html/global-mail-css.tpl b/themes/default/template/mail/text/html/global-mail-css.tpl
index 5c8e87a54..5c8e87a54 100644
--- a/template/default/mail/text/html/global-mail-css.tpl
+++ b/themes/default/template/mail/text/html/global-mail-css.tpl
diff --git a/template/default/mail/text/html/header.tpl b/themes/default/template/mail/text/html/header.tpl
index 9ab46693c..9ab46693c 100644
--- a/template/default/mail/text/html/header.tpl
+++ b/themes/default/template/mail/text/html/header.tpl
diff --git a/template/yoga/theme/dark/index.php b/themes/default/template/mail/text/html/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/dark/index.php
+++ b/themes/default/template/mail/text/html/index.php
diff --git a/template/default/mail/text/html/notification_by_mail.tpl b/themes/default/template/mail/text/html/notification_by_mail.tpl
index 5a0115e2f..5a0115e2f 100644
--- a/template/default/mail/text/html/notification_by_mail.tpl
+++ b/themes/default/template/mail/text/html/notification_by_mail.tpl
diff --git a/template/yoga/theme/index.php b/themes/default/template/mail/text/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/index.php
+++ b/themes/default/template/mail/text/index.php
diff --git a/template/default/mail/text/plain/cat_group_info.tpl b/themes/default/template/mail/text/plain/cat_group_info.tpl
index 59604846e..59604846e 100644
--- a/template/default/mail/text/plain/cat_group_info.tpl
+++ b/themes/default/template/mail/text/plain/cat_group_info.tpl
diff --git a/template/default/mail/text/plain/footer.tpl b/themes/default/template/mail/text/plain/footer.tpl
index c386f0962..c386f0962 100644
--- a/template/default/mail/text/plain/footer.tpl
+++ b/themes/default/template/mail/text/plain/footer.tpl
diff --git a/template/default/mail/text/plain/header.tpl b/themes/default/template/mail/text/plain/header.tpl
index 6fcc863d2..6fcc863d2 100644
--- a/template/default/mail/text/plain/header.tpl
+++ b/themes/default/template/mail/text/plain/header.tpl
diff --git a/template/yoga/theme/p0w0/images/index.php b/themes/default/template/mail/text/plain/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/p0w0/images/index.php
+++ b/themes/default/template/mail/text/plain/index.php
diff --git a/template/default/mail/text/plain/notification_by_mail.tpl b/themes/default/template/mail/text/plain/notification_by_mail.tpl
index b1928853f..b1928853f 100644
--- a/template/default/mail/text/plain/notification_by_mail.tpl
+++ b/themes/default/template/mail/text/plain/notification_by_mail.tpl
diff --git a/template/default/mainpage_categories.tpl b/themes/default/template/mainpage_categories.tpl
index 0a88d3534..0a88d3534 100644
--- a/template/default/mainpage_categories.tpl
+++ b/themes/default/template/mainpage_categories.tpl
diff --git a/template/default/menubar.tpl b/themes/default/template/menubar.tpl
index 8b1e8f4b6..8b1e8f4b6 100644
--- a/template/default/menubar.tpl
+++ b/themes/default/template/menubar.tpl
diff --git a/template/default/menubar_categories.tpl b/themes/default/template/menubar_categories.tpl
index 02a9b6668..02a9b6668 100644
--- a/template/default/menubar_categories.tpl
+++ b/themes/default/template/menubar_categories.tpl
diff --git a/template/default/menubar_identification.tpl b/themes/default/template/menubar_identification.tpl
index 2717e1019..2717e1019 100644
--- a/template/default/menubar_identification.tpl
+++ b/themes/default/template/menubar_identification.tpl
diff --git a/template/default/menubar_links.tpl b/themes/default/template/menubar_links.tpl
index a945bd0d6..a945bd0d6 100644
--- a/template/default/menubar_links.tpl
+++ b/themes/default/template/menubar_links.tpl
diff --git a/template/default/menubar_menu.tpl b/themes/default/template/menubar_menu.tpl
index 0d6541b97..0d6541b97 100644
--- a/template/default/menubar_menu.tpl
+++ b/themes/default/template/menubar_menu.tpl
diff --git a/template/default/menubar_specials.tpl b/themes/default/template/menubar_specials.tpl
index 1f00a2dc9..1f00a2dc9 100644
--- a/template/default/menubar_specials.tpl
+++ b/themes/default/template/menubar_specials.tpl
diff --git a/template/default/menubar_tags.tpl b/themes/default/template/menubar_tags.tpl
index 220175008..220175008 100644
--- a/template/default/menubar_tags.tpl
+++ b/themes/default/template/menubar_tags.tpl
diff --git a/template/default/month_calendar.tpl b/themes/default/template/month_calendar.tpl
index 45d6079e1..45d6079e1 100644
--- a/template/default/month_calendar.tpl
+++ b/themes/default/template/month_calendar.tpl
diff --git a/template/default/navigation_bar.tpl b/themes/default/template/navigation_bar.tpl
index 82c66bd15..82c66bd15 100644
--- a/template/default/navigation_bar.tpl
+++ b/themes/default/template/navigation_bar.tpl
diff --git a/template/default/nbm.tpl b/themes/default/template/nbm.tpl
index 646335813..646335813 100644
--- a/template/default/nbm.tpl
+++ b/themes/default/template/nbm.tpl
diff --git a/template/default/notification.tpl b/themes/default/template/notification.tpl
index 8f6dcb680..8f6dcb680 100644
--- a/template/default/notification.tpl
+++ b/themes/default/template/notification.tpl
diff --git a/template/default/password.tpl b/themes/default/template/password.tpl
index 1e0471bd5..1e0471bd5 100644
--- a/template/default/password.tpl
+++ b/themes/default/template/password.tpl
diff --git a/template/default/picture.tpl b/themes/default/template/picture.tpl
index 9499a546d..885d31112 100644
--- a/template/default/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -190,7 +190,7 @@ y.callService(
 			  <input type="submit" name="rate" value="{$mark}" class="rateButton" title="{$mark}">
 			{/if}
 			{/foreach}
-			<script type="text/javascript" src="{$ROOT_URL}template/{$themeconf.template}/rating.js"></script>
+			<script type="text/javascript" src="{$ROOT_URL}themes/default/js/rating.js"></script>
 			<script type="text/javascript">
 			makeNiceRatingForm( {ldelim}rootUrl: '{$ROOT_URL|@escape:"javascript"}', image_id: {$current.id},
 			updateRateText: "{'update_rate'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"),
diff --git a/template/default/picture_content.tpl b/themes/default/template/picture_content.tpl
index 384a9ce1a..384a9ce1a 100644
--- a/template/default/picture_content.tpl
+++ b/themes/default/template/picture_content.tpl
diff --git a/template/default/picture_nav_buttons.tpl b/themes/default/template/picture_nav_buttons.tpl
index 06b236a88..06b236a88 100644
--- a/template/default/picture_nav_buttons.tpl
+++ b/themes/default/template/picture_nav_buttons.tpl
diff --git a/template/default/profile.tpl b/themes/default/template/profile.tpl
index b94c3967c..b94c3967c 100644
--- a/template/default/profile.tpl
+++ b/themes/default/template/profile.tpl
diff --git a/template/default/profile_content.tpl b/themes/default/template/profile_content.tpl
index e6736f078..876a2a8a8 100644
--- a/template/default/profile_content.tpl
+++ b/themes/default/template/profile_content.tpl
@@ -59,7 +59,7 @@
         <span class="property">
           <label for="template">{'Interface theme'|@translate}</label>
         </span>
-        {html_options name=template options=$template_options selected=$template_selection}
+        {html_options name=theme options=$template_options selected=$template_selection}
       </li>
       <li>
         <span class="property">
diff --git a/template/default/redirect.tpl b/themes/default/template/redirect.tpl
index aa90953ec..aa90953ec 100644
--- a/template/default/redirect.tpl
+++ b/themes/default/template/redirect.tpl
diff --git a/template/default/register.tpl b/themes/default/template/register.tpl
index 7e5a31d70..7e5a31d70 100644
--- a/template/default/register.tpl
+++ b/themes/default/template/register.tpl
diff --git a/template/default/search.tpl b/themes/default/template/search.tpl
index 57f799e75..57f799e75 100644
--- a/template/default/search.tpl
+++ b/themes/default/template/search.tpl
diff --git a/template/default/search_rules.tpl b/themes/default/template/search_rules.tpl
index 28b2e423f..28b2e423f 100644
--- a/template/default/search_rules.tpl
+++ b/themes/default/template/search_rules.tpl
diff --git a/template/default/slideshow.tpl b/themes/default/template/slideshow.tpl
index a310935a2..a310935a2 100644
--- a/template/default/slideshow.tpl
+++ b/themes/default/template/slideshow.tpl
diff --git a/template/default/tags.tpl b/themes/default/template/tags.tpl
index 95891df0e..95891df0e 100644
--- a/template/default/tags.tpl
+++ b/themes/default/template/tags.tpl
diff --git a/template/default/thumbnails.tpl b/themes/default/template/thumbnails.tpl
index 1061f77cd..1061f77cd 100644
--- a/template/default/thumbnails.tpl
+++ b/themes/default/template/thumbnails.tpl
diff --git a/template/default/upload.tpl b/themes/default/template/upload.tpl
index 00f17be89..00f17be89 100644
--- a/template/default/upload.tpl
+++ b/themes/default/template/upload.tpl
diff --git a/template/yoga/thumbnails.css b/themes/default/thumbnails.css
index 5ed9544c9..5ed9544c9 100644
--- a/template/yoga/thumbnails.css
+++ b/themes/default/thumbnails.css
diff --git a/template/yoga/theme/p0w0/index.php b/themes/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/p0w0/index.php
+++ b/themes/index.php
diff --git a/template/yoga/theme/p0w0/images/button-bg.png b/themes/p0w0/images/button-bg.png
index 1ea3b3bd0..1ea3b3bd0 100644
--- a/template/yoga/theme/p0w0/images/button-bg.png
+++ b/themes/p0w0/images/button-bg.png
diff --git a/template/yoga/theme/wipi/images/index.php b/themes/p0w0/images/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/wipi/images/index.php
+++ b/themes/p0w0/images/index.php
diff --git a/template/yoga/theme/wipi/index.php b/themes/p0w0/index.php
index 871b52b6a..871b52b6a 100644
--- a/template/yoga/theme/wipi/index.php
+++ b/themes/p0w0/index.php
diff --git a/template/yoga/theme/p0w0/mail-css.tpl b/themes/p0w0/mail-css.tpl
index d1e27460a..be4e4c22e 100644
--- a/template/yoga/theme/p0w0/mail-css.tpl
+++ b/themes/p0w0/mail-css.tpl
@@ -5,7 +5,7 @@ body {ldelim} background-color:#cde; color:#369;}
 #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
 #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
 color: #69c;}
-h2 {ldelim} color:#fff;background: #369 url({$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/images/button-bg.png);}
+h2 {ldelim} color:#fff;background: #369 url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/button-bg.png);}
 img {ldelim} margin:16px;padding:15px;border:1px solid #69c;background-color:#eef;-moz-border-radius:4px; border-radius:4px 4px; }
 img:hover {ldelim} border: 1px solid #c60; -moz-border-radius:4px; border-radius:4px 4px; }
 a {ldelim} color: #f92; background: transparent; }
diff --git a/template/yoga/theme/p0w0/theme.css b/themes/p0w0/theme.css
index 06f922082..06f922082 100644
--- a/template/yoga/theme/p0w0/theme.css
+++ b/themes/p0w0/theme.css
diff --git a/template/yoga/theme/wipi/images/tableh1_bg.png b/themes/wipi/images/tableh1_bg.png
index 8163e23bf..8163e23bf 100644
--- a/template/yoga/theme/wipi/images/tableh1_bg.png
+++ b/themes/wipi/images/tableh1_bg.png
diff --git a/template/yoga/theme/wipi/images/tableh2_bg.png b/themes/wipi/images/tableh2_bg.png
index be06ee428..be06ee428 100644
--- a/template/yoga/theme/wipi/images/tableh2_bg.png
+++ b/themes/wipi/images/tableh2_bg.png
diff --git a/template/yoga/theme/wipi/mail-css.tpl b/themes/wipi/mail-css.tpl
index a99f13c5a..a8da286b3 100644
--- a/template/yoga/theme/wipi/mail-css.tpl
+++ b/themes/wipi/mail-css.tpl
@@ -5,7 +5,7 @@ body {ldelim} background-color:#111; color:#69c;}
 #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
 #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
 color: #69c;}
-h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/images/tableh1_bg.png);}
+h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/tableh1_bg.png);}
 img {ldelim} margin: 16px; padding:15px;border:1px solid #eee; -moz-border-radius: 4px; border-radius: 4px 4px; }
 img:hover {ldelim} border:1px solid #69c; -moz-border-radius: 4px; border-radius: 4px 4px; }
 a {ldelim} color: #69c; background: transparent; }
diff --git a/template/yoga/theme/wipi/theme.css b/themes/wipi/theme.css
index 670d3a57d..670d3a57d 100644
--- a/template/yoga/theme/wipi/theme.css
+++ b/themes/wipi/theme.css
diff --git a/template/yoga/theme/wipi/themeconf.inc.php b/themes/wipi/themeconf.inc.php
index 6644a7590..384e22769 100644
--- a/template/yoga/theme/wipi/themeconf.inc.php
+++ b/themes/wipi/themeconf.inc.php
@@ -1,11 +1,7 @@
 <?php
 $themeconf = array(
-  'template' => 'yoga',
-  'theme' => 'wipi',
-  'icon_dir' => 'template/yoga/icon',
-  'admin_icon_dir' => 'template/yoga/icon/admin',
-  'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
-  'local_head' => '',
+  'theme'  => 'wipi',
+  'parent' => 'default',
 );
 if ( !isset($lang['Theme: wipi']) )
 {