feature 1502: based on Dotclear model, P@t has reorganized the way Piwigo

manages template/theme in a simpler "theme only level" architecture. It
supports multiple level inheritance.

git-svn-id: http://piwigo.org/svn/trunk@5123 68402e56-0260-453c-a942-63ccdbb3a9ee

96 files changed, 1 insertions, 15 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/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/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/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/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/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/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