208 files changed, 46 insertions, 54 deletions

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/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/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/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/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/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/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/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/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/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/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']) )
 {