105 files changed, 25 insertions, 7 deletions

diff --git a/template/admin/yoga/about.tpl b/template/yoga/about.tpl
index 6efa0e9ee..6efa0e9ee 100644
--- a/template/admin/yoga/about.tpl
+++ b/template/yoga/about.tpl
diff --git a/template/public/yoga/admin.tpl b/template/yoga/admin.tpl
index 24177e427..24177e427 100644
--- a/template/public/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
diff --git a/template/public/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
index ec4b66d43..ec4b66d43 100644
--- a/template/public/yoga/admin/cat_list.tpl
+++ b/template/yoga/admin/cat_list.tpl
diff --git a/template/public/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
index ed8861d84..ed8861d84 100644
--- a/template/public/yoga/admin/cat_modify.tpl
+++ b/template/yoga/admin/cat_modify.tpl
diff --git a/template/public/yoga/admin/cat_move.tpl b/template/yoga/admin/cat_move.tpl
index 5d5247f2f..5d5247f2f 100644
--- a/template/public/yoga/admin/cat_move.tpl
+++ b/template/yoga/admin/cat_move.tpl
diff --git a/template/public/yoga/admin/cat_options.tpl b/template/yoga/admin/cat_options.tpl
index 891dc37d4..891dc37d4 100644
--- a/template/public/yoga/admin/cat_options.tpl
+++ b/template/yoga/admin/cat_options.tpl
diff --git a/template/admin/yoga/admin/cat_perm.tpl b/template/yoga/admin/cat_perm.tpl
index 9c8fafa69..9c8fafa69 100644
--- a/template/admin/yoga/admin/cat_perm.tpl
+++ b/template/yoga/admin/cat_perm.tpl
diff --git a/template/admin/yoga/admin/comments.tpl b/template/yoga/admin/comments.tpl
index 065a1c8ee..065a1c8ee 100644
--- a/template/admin/yoga/admin/comments.tpl
+++ b/template/yoga/admin/comments.tpl
diff --git a/template/public/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl
index a0578692d..a0578692d 100644
--- a/template/public/yoga/admin/configuration.tpl
+++ b/template/yoga/admin/configuration.tpl
diff --git a/template/admin/yoga/admin/double_select.tpl b/template/yoga/admin/double_select.tpl
index 2bfa28072..2bfa28072 100644
--- a/template/admin/yoga/admin/double_select.tpl
+++ b/template/yoga/admin/double_select.tpl
diff --git a/template/public/yoga/admin/element_set_global.tpl b/template/yoga/admin/element_set_global.tpl
index 7bb9d7006..7bb9d7006 100644
--- a/template/public/yoga/admin/element_set_global.tpl
+++ b/template/yoga/admin/element_set_global.tpl
diff --git a/template/admin/yoga/admin/element_set_unit.tpl b/template/yoga/admin/element_set_unit.tpl
index 5adce8833..5adce8833 100644
--- a/template/admin/yoga/admin/element_set_unit.tpl
+++ b/template/yoga/admin/element_set_unit.tpl
diff --git a/template/public/yoga/admin/group_list.tpl b/template/yoga/admin/group_list.tpl
index 7b7dd67eb..7b7dd67eb 100644
--- a/template/public/yoga/admin/group_list.tpl
+++ b/template/yoga/admin/group_list.tpl
diff --git a/template/admin/yoga/admin/group_perm.tpl b/template/yoga/admin/group_perm.tpl
index 91c2f637a..91c2f637a 100644
--- a/template/admin/yoga/admin/group_perm.tpl
+++ b/template/yoga/admin/group_perm.tpl
diff --git a/template/public/yoga/admin/intro.tpl b/template/yoga/admin/intro.tpl
index 58c6b2510..58c6b2510 100644
--- a/template/public/yoga/admin/intro.tpl
+++ b/template/yoga/admin/intro.tpl
diff --git a/template/public/yoga/admin/maintenance.tpl b/template/yoga/admin/maintenance.tpl
index 697e0954b..697e0954b 100644
--- a/template/public/yoga/admin/maintenance.tpl
+++ b/template/yoga/admin/maintenance.tpl
diff --git a/template/admin/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl
index 22309e96d..22309e96d 100644
--- a/template/admin/yoga/admin/notification_by_mail.tpl
+++ b/template/yoga/admin/notification_by_mail.tpl
diff --git a/template/public/yoga/admin/picture_modify.tpl b/template/yoga/admin/picture_modify.tpl
index c10e7744e..c10e7744e 100644
--- a/template/public/yoga/admin/picture_modify.tpl
+++ b/template/yoga/admin/picture_modify.tpl
diff --git a/template/admin/yoga/admin/rating.tpl b/template/yoga/admin/rating.tpl
index ac78bf419..ac78bf419 100644
--- a/template/admin/yoga/admin/rating.tpl
+++ b/template/yoga/admin/rating.tpl
diff --git a/template/public/yoga/admin/site_manager.tpl b/template/yoga/admin/site_manager.tpl
index 88b77a362..88b77a362 100644
--- a/template/public/yoga/admin/site_manager.tpl
+++ b/template/yoga/admin/site_manager.tpl
diff --git a/template/admin/yoga/admin/site_update.tpl b/template/yoga/admin/site_update.tpl
index d3d0221ca..d3d0221ca 100644
--- a/template/admin/yoga/admin/site_update.tpl
+++ b/template/yoga/admin/site_update.tpl
diff --git a/template/public/yoga/admin/stats.tpl b/template/yoga/admin/stats.tpl
index 75de81f79..75de81f79 100644
--- a/template/public/yoga/admin/stats.tpl
+++ b/template/yoga/admin/stats.tpl
diff --git a/template/admin/yoga/admin/tags.tpl b/template/yoga/admin/tags.tpl
index 8fe666b59..8fe666b59 100644
--- a/template/admin/yoga/admin/tags.tpl
+++ b/template/yoga/admin/tags.tpl
diff --git a/template/public/yoga/admin/thumbnail.tpl b/template/yoga/admin/thumbnail.tpl
index cf5345d43..cf5345d43 100644
--- a/template/public/yoga/admin/thumbnail.tpl
+++ b/template/yoga/admin/thumbnail.tpl
diff --git a/template/admin/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl
index e6c1e81b6..e6c1e81b6 100644
--- a/template/admin/yoga/admin/user_list.tpl
+++ b/template/yoga/admin/user_list.tpl
diff --git a/template/admin/yoga/admin/user_perm.tpl b/template/yoga/admin/user_perm.tpl
index a24fd9096..a24fd9096 100644
--- a/template/admin/yoga/admin/user_perm.tpl
+++ b/template/yoga/admin/user_perm.tpl
diff --git a/template/public/yoga/admin/waiting.tpl b/template/yoga/admin/waiting.tpl
index b48aa314b..b48aa314b 100644
--- a/template/public/yoga/admin/waiting.tpl
+++ b/template/yoga/admin/waiting.tpl
diff --git a/template/public/yoga/comments.tpl b/template/yoga/comments.tpl
index 6bf28d33b..6bf28d33b 100644
--- a/template/public/yoga/comments.tpl
+++ b/template/yoga/comments.tpl
diff --git a/template/public/yoga/content.css b/template/yoga/content.css
index 7a8909856..7a8909856 100644
--- a/template/public/yoga/content.css
+++ b/template/yoga/content.css
diff --git a/template/admin/yoga/dclear.css b/template/yoga/dclear.css
index e69de29bb..e69de29bb 100644
--- a/template/admin/yoga/dclear.css
+++ b/template/yoga/dclear.css
diff --git a/template/public/yoga/default-colors.css b/template/yoga/default-colors.css
index 8b73f966b..8b73f966b 100644
--- a/template/public/yoga/default-colors.css
+++ b/template/yoga/default-colors.css
diff --git a/template/public/yoga/default-layout.css b/template/yoga/default-layout.css
index a9fc2da1c..a9fc2da1c 100644
--- a/template/public/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
diff --git a/template/public/yoga/fix-ie5-ie6.css b/template/yoga/fix-ie5-ie6.css
index 8dad42298..8dad42298 100644
--- a/template/public/yoga/fix-ie5-ie6.css
+++ b/template/yoga/fix-ie5-ie6.css
diff --git a/template/public/yoga/fix-khtml.css b/template/yoga/fix-khtml.css
index 6853313e9..6853313e9 100644
--- a/template/public/yoga/fix-khtml.css
+++ b/template/yoga/fix-khtml.css
diff --git a/template/admin/yoga/footer.tpl b/template/yoga/footer.tpl
index 44d905995..44d905995 100644
--- a/template/admin/yoga/footer.tpl
+++ b/template/yoga/footer.tpl
diff --git a/template/admin/yoga/header.tpl b/template/yoga/header.tpl
index 9776eabe8..d432d7b63 100644
--- a/template/admin/yoga/header.tpl
+++ b/template/yoga/header.tpl
@@ -4,16 +4,16 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
 <link rel="shortcut icon" type="image/x-icon" href="{pwg_root}template-common/favicon.ico">
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/layout.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}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="{pwg_root}template/admin/{themeconf:template}/fix-khtml.css">
+<link rel="stylesheet" type="text/nonsense" href="{pwg_root}template/{themeconf:template}/fix-khtml.css">
 <!--[if lt IE 7]>
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/fix-ie5-ie6.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/fix-ie5-ie6.css">
 <![endif]-->
-<link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/admin/{themeconf:template}/print.css">
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/default-colors.css">
-<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/theme/{themeconf:theme}/theme.css">
+<link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/{themeconf:template}/print.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/default-colors.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/theme.css">
 <!-- BEGIN next -->
 <link rel="prefetch" href="{next.U_IMG_SRC}">
 <!-- END next -->
diff --git a/template/admin/yoga/icon/add_tag.png b/template/yoga/icon/add_tag.png
index 9051a1d26..9051a1d26 100644
--- a/template/admin/yoga/icon/add_tag.png
+++ b/template/yoga/icon/add_tag.png
diff --git a/template/admin/yoga/icon/admin/errors.png b/template/yoga/icon/admin/errors.png
index 3c8a37df5..3c8a37df5 100644
--- a/template/admin/yoga/icon/admin/errors.png
+++ b/template/yoga/icon/admin/errors.png
diff --git a/template/admin/yoga/icon/admin/infos.png b/template/yoga/icon/admin/infos.png
index dc8c8a457..dc8c8a457 100644
--- a/template/admin/yoga/icon/admin/infos.png
+++ b/template/yoga/icon/admin/infos.png
diff --git a/template/admin/yoga/icon/caddie_add.png b/template/yoga/icon/caddie_add.png
index eb20f4e06..eb20f4e06 100644
--- a/template/admin/yoga/icon/caddie_add.png
+++ b/template/yoga/icon/caddie_add.png
diff --git a/template/admin/yoga/icon/calendar.png b/template/yoga/icon/calendar.png
index e0a44a13d..e0a44a13d 100644
--- a/template/admin/yoga/icon/calendar.png
+++ b/template/yoga/icon/calendar.png
diff --git a/template/admin/yoga/icon/calendar_created.png b/template/yoga/icon/calendar_created.png
index 14a84c43c..14a84c43c 100644
--- a/template/admin/yoga/icon/calendar_created.png
+++ b/template/yoga/icon/calendar_created.png
diff --git a/template/admin/yoga/icon/category_children.png b/template/yoga/icon/category_children.png
index 7205c3f61..7205c3f61 100644
--- a/template/admin/yoga/icon/category_children.png
+++ b/template/yoga/icon/category_children.png
diff --git a/template/admin/yoga/icon/category_delete.png b/template/yoga/icon/category_delete.png
index da796da11..da796da11 100644
--- a/template/admin/yoga/icon/category_delete.png
+++ b/template/yoga/icon/category_delete.png
diff --git a/template/admin/yoga/icon/category_edit.png b/template/yoga/icon/category_edit.png
index 0f3b619ed..0f3b619ed 100644
--- a/template/admin/yoga/icon/category_edit.png
+++ b/template/yoga/icon/category_edit.png
diff --git a/template/admin/yoga/icon/category_elements.png b/template/yoga/icon/category_elements.png
index 1d367b38f..1d367b38f 100644
--- a/template/admin/yoga/icon/category_elements.png
+++ b/template/yoga/icon/category_elements.png
diff --git a/template/admin/yoga/icon/category_jump-to.png b/template/yoga/icon/category_jump-to.png
index 62db1f4ee..62db1f4ee 100644
--- a/template/admin/yoga/icon/category_jump-to.png
+++ b/template/yoga/icon/category_jump-to.png
diff --git a/template/admin/yoga/icon/category_permissions.png b/template/yoga/icon/category_permissions.png
index 4780841ae..4780841ae 100644
--- a/template/admin/yoga/icon/category_permissions.png
+++ b/template/yoga/icon/category_permissions.png
diff --git a/template/admin/yoga/icon/category_representant_random.png b/template/yoga/icon/category_representant_random.png
index dfa69846f..dfa69846f 100644
--- a/template/admin/yoga/icon/category_representant_random.png
+++ b/template/yoga/icon/category_representant_random.png
diff --git a/template/admin/yoga/icon/del_favorite.png b/template/yoga/icon/del_favorite.png
index cfc609749..cfc609749 100644
--- a/template/admin/yoga/icon/del_favorite.png
+++ b/template/yoga/icon/del_favorite.png
diff --git a/template/admin/yoga/icon/delete.png b/template/yoga/icon/delete.png
index af10be03e..af10be03e 100644
--- a/template/admin/yoga/icon/delete.png
+++ b/template/yoga/icon/delete.png
diff --git a/template/admin/yoga/icon/exit.png b/template/yoga/icon/exit.png
index 2aafbb4cb..2aafbb4cb 100644
--- a/template/admin/yoga/icon/exit.png
+++ b/template/yoga/icon/exit.png
diff --git a/template/admin/yoga/icon/favorite.png b/template/yoga/icon/favorite.png
index 58befd9e3..58befd9e3 100644
--- a/template/admin/yoga/icon/favorite.png
+++ b/template/yoga/icon/favorite.png
diff --git a/template/admin/yoga/icon/first.png b/template/yoga/icon/first.png
index 2b8db1cff..2b8db1cff 100644
--- a/template/admin/yoga/icon/first.png
+++ b/template/yoga/icon/first.png
diff --git a/template/admin/yoga/icon/help.png b/template/yoga/icon/help.png
index c76f68292..c76f68292 100644
--- a/template/admin/yoga/icon/help.png
+++ b/template/yoga/icon/help.png
diff --git a/template/admin/yoga/icon/home.png b/template/yoga/icon/home.png
index cce450d85..cce450d85 100644
--- a/template/admin/yoga/icon/home.png
+++ b/template/yoga/icon/home.png
diff --git a/template/admin/yoga/icon/last.png b/template/yoga/icon/last.png
index 12e1367a7..12e1367a7 100644
--- a/template/admin/yoga/icon/last.png
+++ b/template/yoga/icon/last.png
diff --git a/template/admin/yoga/icon/left.png b/template/yoga/icon/left.png
index 63d306c9c..63d306c9c 100644
--- a/template/admin/yoga/icon/left.png
+++ b/template/yoga/icon/left.png
diff --git a/template/admin/yoga/icon/lost_password.png b/template/yoga/icon/lost_password.png
index ad6d71422..ad6d71422 100644
--- a/template/admin/yoga/icon/lost_password.png
+++ b/template/yoga/icon/lost_password.png
diff --git a/template/admin/yoga/icon/metadata.png b/template/yoga/icon/metadata.png
index d5d8fa6dc..d5d8fa6dc 100644
--- a/template/admin/yoga/icon/metadata.png
+++ b/template/yoga/icon/metadata.png
diff --git a/template/admin/yoga/icon/mimetypes/avi.png b/template/yoga/icon/mimetypes/avi.png
index 065f0b282..065f0b282 100644
--- a/template/admin/yoga/icon/mimetypes/avi.png
+++ b/template/yoga/icon/mimetypes/avi.png
diff --git a/template/admin/yoga/icon/mimetypes/mp3.png b/template/yoga/icon/mimetypes/mp3.png
index afb7e1b0a..afb7e1b0a 100644
--- a/template/admin/yoga/icon/mimetypes/mp3.png
+++ b/template/yoga/icon/mimetypes/mp3.png
diff --git a/template/admin/yoga/icon/mimetypes/mpg.png b/template/yoga/icon/mimetypes/mpg.png
index f7dbd2388..f7dbd2388 100644
--- a/template/admin/yoga/icon/mimetypes/mpg.png
+++ b/template/yoga/icon/mimetypes/mpg.png
diff --git a/template/admin/yoga/icon/mimetypes/ogg.png b/template/yoga/icon/mimetypes/ogg.png
index ead3f62c3..ead3f62c3 100644
--- a/template/admin/yoga/icon/mimetypes/ogg.png
+++ b/template/yoga/icon/mimetypes/ogg.png
diff --git a/template/admin/yoga/icon/mimetypes/zip.png b/template/yoga/icon/mimetypes/zip.png
index 1f08fe1a3..1f08fe1a3 100644
--- a/template/admin/yoga/icon/mimetypes/zip.png
+++ b/template/yoga/icon/mimetypes/zip.png
diff --git a/template/admin/yoga/icon/normal_mode.png b/template/yoga/icon/normal_mode.png
index 07318b568..07318b568 100644
--- a/template/admin/yoga/icon/normal_mode.png
+++ b/template/yoga/icon/normal_mode.png
diff --git a/template/admin/yoga/icon/permissions.png b/template/yoga/icon/permissions.png
index 33091eb85..33091eb85 100644
--- a/template/admin/yoga/icon/permissions.png
+++ b/template/yoga/icon/permissions.png
diff --git a/template/admin/yoga/icon/preferences.png b/template/yoga/icon/preferences.png
index 0f3b619ed..0f3b619ed 100644
--- a/template/admin/yoga/icon/preferences.png
+++ b/template/yoga/icon/preferences.png
diff --git a/template/admin/yoga/icon/recent.png b/template/yoga/icon/recent.png
index 78c1428ca..78c1428ca 100644
--- a/template/admin/yoga/icon/recent.png
+++ b/template/yoga/icon/recent.png
diff --git a/template/admin/yoga/icon/register.png b/template/yoga/icon/register.png
index d1dd3c834..d1dd3c834 100644
--- a/template/admin/yoga/icon/register.png
+++ b/template/yoga/icon/register.png
diff --git a/template/admin/yoga/icon/representative.png b/template/yoga/icon/representative.png
index f1141d91b..f1141d91b 100644
--- a/template/admin/yoga/icon/representative.png
+++ b/template/yoga/icon/representative.png
diff --git a/template/admin/yoga/icon/right.png b/template/yoga/icon/right.png
index f998098e4..f998098e4 100644
--- a/template/admin/yoga/icon/right.png
+++ b/template/yoga/icon/right.png
diff --git a/template/admin/yoga/icon/save.png b/template/yoga/icon/save.png
index b4b9da08b..b4b9da08b 100644
--- a/template/admin/yoga/icon/save.png
+++ b/template/yoga/icon/save.png
diff --git a/template/admin/yoga/icon/search_rules.png b/template/yoga/icon/search_rules.png
index 300186647..300186647 100644
--- a/template/admin/yoga/icon/search_rules.png
+++ b/template/yoga/icon/search_rules.png
diff --git a/template/admin/yoga/icon/slideshow.png b/template/yoga/icon/slideshow.png
index 455d73fdf..455d73fdf 100644
--- a/template/admin/yoga/icon/slideshow.png
+++ b/template/yoga/icon/slideshow.png
diff --git a/template/admin/yoga/icon/sync_metadata.png b/template/yoga/icon/sync_metadata.png
index 03570ead6..03570ead6 100644
--- a/template/admin/yoga/icon/sync_metadata.png
+++ b/template/yoga/icon/sync_metadata.png
diff --git a/template/admin/yoga/icon/up.png b/template/yoga/icon/up.png
index 0c9cda5b1..0c9cda5b1 100644
--- a/template/admin/yoga/icon/up.png
+++ b/template/yoga/icon/up.png
diff --git a/template/public/yoga/identification.tpl b/template/yoga/identification.tpl
index dd07d0135..dd07d0135 100644
--- a/template/public/yoga/identification.tpl
+++ b/template/yoga/identification.tpl
diff --git a/template/admin/yoga/image.css b/template/yoga/image.css
index 9ecbaea08..9ecbaea08 100644
--- a/template/admin/yoga/image.css
+++ b/template/yoga/image.css
diff --git a/template/public/yoga/index.tpl b/template/yoga/index.tpl
index becf011ce..becf011ce 100644
--- a/template/public/yoga/index.tpl
+++ b/template/yoga/index.tpl
diff --git a/template/admin/yoga/install.tpl b/template/yoga/install.tpl
index 2332910e2..2332910e2 100644
--- a/template/admin/yoga/install.tpl
+++ b/template/yoga/install.tpl
diff --git a/template/public/yoga/layout.css b/template/yoga/layout.css
index 1f6c6f4e3..79cb2911f 100644
--- a/template/public/yoga/layout.css
+++ b/template/yoga/layout.css
@@ -9,5 +9,5 @@
 /* Override properties with import local file */
 @import "local-layout.css";
 /* common css */
-@import "../../../template-common/layout.css";
+@import "../../template-common/layout.css";
 
diff --git a/template/public/yoga/mainpage_categories.tpl b/template/yoga/mainpage_categories.tpl
index 8c00b433e..8c00b433e 100644
--- a/template/public/yoga/mainpage_categories.tpl
+++ b/template/yoga/mainpage_categories.tpl
diff --git a/template/admin/yoga/menubar.css b/template/yoga/menubar.css
index f8fbdf914..f8fbdf914 100644
--- a/template/admin/yoga/menubar.css
+++ b/template/yoga/menubar.css
diff --git a/template/public/yoga/month_calendar.tpl b/template/yoga/month_calendar.tpl
index 7e531e7c7..7e531e7c7 100644
--- a/template/public/yoga/month_calendar.tpl
+++ b/template/yoga/month_calendar.tpl
diff --git a/template/admin/yoga/nbm.tpl b/template/yoga/nbm.tpl
index a22744e5b..a22744e5b 100644
--- a/template/admin/yoga/nbm.tpl
+++ b/template/yoga/nbm.tpl
diff --git a/template/admin/yoga/notification.tpl b/template/yoga/notification.tpl
index d4b178b42..d4b178b42 100644
--- a/template/admin/yoga/notification.tpl
+++ b/template/yoga/notification.tpl
diff --git a/template/public/yoga/password.tpl b/template/yoga/password.tpl
index f581507e2..f581507e2 100644
--- a/template/public/yoga/password.tpl
+++ b/template/yoga/password.tpl
diff --git a/template/admin/yoga/picture.tpl b/template/yoga/picture.tpl
index cdeeaf4a8..cdeeaf4a8 100644
--- a/template/admin/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
diff --git a/template/admin/yoga/popuphelp.css b/template/yoga/popuphelp.css
index b61b7952d..b61b7952d 100644
--- a/template/admin/yoga/popuphelp.css
+++ b/template/yoga/popuphelp.css
diff --git a/template/admin/yoga/popuphelp.tpl b/template/yoga/popuphelp.tpl
index 3b3e27328..3b3e27328 100644
--- a/template/admin/yoga/popuphelp.tpl
+++ b/template/yoga/popuphelp.tpl
diff --git a/template/admin/yoga/print.css b/template/yoga/print.css
index bb564378d..bb564378d 100644
--- a/template/admin/yoga/print.css
+++ b/template/yoga/print.css
diff --git a/template/admin/yoga/profile.tpl b/template/yoga/profile.tpl
index b3837f454..b3837f454 100644
--- a/template/admin/yoga/profile.tpl
+++ b/template/yoga/profile.tpl
diff --git a/template/admin/yoga/redirect.tpl b/template/yoga/redirect.tpl
index 446f187a3..446f187a3 100644
--- a/template/admin/yoga/redirect.tpl
+++ b/template/yoga/redirect.tpl
diff --git a/template/admin/yoga/register.tpl b/template/yoga/register.tpl
index be3fb4a79..be3fb4a79 100644
--- a/template/admin/yoga/register.tpl
+++ b/template/yoga/register.tpl
diff --git a/template/public/yoga/search.tpl b/template/yoga/search.tpl
index 1e3c9be2d..1e3c9be2d 100644
--- a/template/public/yoga/search.tpl
+++ b/template/yoga/search.tpl
diff --git a/template/admin/yoga/search_rules.tpl b/template/yoga/search_rules.tpl
index 921df4a12..921df4a12 100644
--- a/template/admin/yoga/search_rules.tpl
+++ b/template/yoga/search_rules.tpl
diff --git a/template/admin/yoga/tags.tpl b/template/yoga/tags.tpl
index 33f69ca69..33f69ca69 100644
--- a/template/admin/yoga/tags.tpl
+++ b/template/yoga/tags.tpl
diff --git a/template/public/yoga/theme/clear/theme.css b/template/yoga/theme/clear/theme.css
index 56da48326..56da48326 100644
--- a/template/public/yoga/theme/clear/theme.css
+++ b/template/yoga/theme/clear/theme.css
diff --git a/template/yoga/theme/clear/themeconf.inc.php b/template/yoga/theme/clear/themeconf.inc.php
new file mode 100644
index 000000000..10b5d104b
--- /dev/null
+++ b/template/yoga/theme/clear/themeconf.inc.php
@@ -0,0 +1,9 @@
+<?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/'
+);
+?>
diff --git a/template/admin/yoga/theme/dark/images/tableh1_bg.png b/template/yoga/theme/dark/images/tableh1_bg.png
index c7785d0f6..c7785d0f6 100644
--- a/template/admin/yoga/theme/dark/images/tableh1_bg.png
+++ b/template/yoga/theme/dark/images/tableh1_bg.png
diff --git a/template/admin/yoga/theme/dark/images/tableh2_bg.png b/template/yoga/theme/dark/images/tableh2_bg.png
index d8c29f93d..d8c29f93d 100644
--- a/template/admin/yoga/theme/dark/images/tableh2_bg.png
+++ b/template/yoga/theme/dark/images/tableh2_bg.png
diff --git a/template/public/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index 854cc48dd..854cc48dd 100644
--- a/template/public/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
diff --git a/template/yoga/theme/dark/themeconf.inc.php b/template/yoga/theme/dark/themeconf.inc.php
new file mode 100644
index 000000000..9785a2916
--- /dev/null
+++ b/template/yoga/theme/dark/themeconf.inc.php
@@ -0,0 +1,9 @@
+<?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/'
+);
+?>
diff --git a/template/admin/yoga/upload.tpl b/template/yoga/upload.tpl
index fcf27b543..fcf27b543 100644
--- a/template/admin/yoga/upload.tpl
+++ b/template/yoga/upload.tpl