diff --git a/include/template.class.php b/include/template.class.php
index 8d5f91a25..5f5ef1ce1 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -111,7 +111,7 @@ class Template {
 		$this->smarty->template_dir[] = $modeling;
       }
 	  // Default template directory
-	  $this->smarty->template_dir[] = './template-common/yoga';
+	  $this->smarty->template_dir[] = './template/default';
 	}
     else
 	{
diff --git a/template/yoga/about.tpl b/template/default/about.tpl
similarity index 100%
rename from template/yoga/about.tpl
rename to template/default/about.tpl
diff --git a/template/yoga/comment_list.tpl b/template/default/comment_list.tpl
similarity index 100%
rename from template/yoga/comment_list.tpl
rename to template/default/comment_list.tpl
diff --git a/template/yoga/comments.tpl b/template/default/comments.tpl
similarity index 100%
rename from template/yoga/comments.tpl
rename to template/default/comments.tpl
diff --git a/template/yoga/footer.tpl b/template/default/footer.tpl
similarity index 100%
rename from template/yoga/footer.tpl
rename to template/default/footer.tpl
diff --git a/template/yoga/header.tpl b/template/default/header.tpl
similarity index 100%
rename from template/yoga/header.tpl
rename to template/default/header.tpl
diff --git a/template/yoga/identification.tpl b/template/default/identification.tpl
similarity index 100%
rename from template/yoga/identification.tpl
rename to template/default/identification.tpl
diff --git a/template/yoga/include/autosize.inc.tpl b/template/default/include/autosize.inc.tpl
similarity index 100%
rename from template/yoga/include/autosize.inc.tpl
rename to template/default/include/autosize.inc.tpl
diff --git a/template/yoga/include/datepicker.inc.tpl b/template/default/include/datepicker.inc.tpl
similarity index 100%
rename from template/yoga/include/datepicker.inc.tpl
rename to template/default/include/datepicker.inc.tpl
diff --git a/template/yoga/include/resize.inc.tpl b/template/default/include/resize.inc.tpl
similarity index 100%
rename from template/yoga/include/resize.inc.tpl
rename to template/default/include/resize.inc.tpl
diff --git a/template/yoga/index.tpl b/template/default/index.tpl
similarity index 100%
rename from template/yoga/index.tpl
rename to template/default/index.tpl
diff --git a/template/yoga/mail/text/html/cat_group_info.tpl b/template/default/mail/text/html/cat_group_info.tpl
similarity index 100%
rename from template/yoga/mail/text/html/cat_group_info.tpl
rename to template/default/mail/text/html/cat_group_info.tpl
diff --git a/template/yoga/mail/text/html/footer.tpl b/template/default/mail/text/html/footer.tpl
similarity index 100%
rename from template/yoga/mail/text/html/footer.tpl
rename to template/default/mail/text/html/footer.tpl
diff --git a/template/yoga/mail/text/html/global-mail-css.tpl b/template/default/mail/text/html/global-mail-css.tpl
similarity index 100%
rename from template/yoga/mail/text/html/global-mail-css.tpl
rename to template/default/mail/text/html/global-mail-css.tpl
diff --git a/template/yoga/mail/text/html/header.tpl b/template/default/mail/text/html/header.tpl
similarity index 100%
rename from template/yoga/mail/text/html/header.tpl
rename to template/default/mail/text/html/header.tpl
diff --git a/template/yoga/mail/text/html/notification_by_mail.tpl b/template/default/mail/text/html/notification_by_mail.tpl
similarity index 100%
rename from template/yoga/mail/text/html/notification_by_mail.tpl
rename to template/default/mail/text/html/notification_by_mail.tpl
diff --git a/template/yoga/mail/text/plain/cat_group_info.tpl b/template/default/mail/text/plain/cat_group_info.tpl
similarity index 100%
rename from template/yoga/mail/text/plain/cat_group_info.tpl
rename to template/default/mail/text/plain/cat_group_info.tpl
diff --git a/template/yoga/mail/text/plain/footer.tpl b/template/default/mail/text/plain/footer.tpl
similarity index 100%
rename from template/yoga/mail/text/plain/footer.tpl
rename to template/default/mail/text/plain/footer.tpl
diff --git a/template/yoga/mail/text/plain/header.tpl b/template/default/mail/text/plain/header.tpl
similarity index 100%
rename from template/yoga/mail/text/plain/header.tpl
rename to template/default/mail/text/plain/header.tpl
diff --git a/template/yoga/mail/text/plain/notification_by_mail.tpl b/template/default/mail/text/plain/notification_by_mail.tpl
similarity index 100%
rename from template/yoga/mail/text/plain/notification_by_mail.tpl
rename to template/default/mail/text/plain/notification_by_mail.tpl
diff --git a/template/yoga/mainpage_categories.tpl b/template/default/mainpage_categories.tpl
similarity index 100%
rename from template/yoga/mainpage_categories.tpl
rename to template/default/mainpage_categories.tpl
diff --git a/template/yoga/menubar.tpl b/template/default/menubar.tpl
similarity index 100%
rename from template/yoga/menubar.tpl
rename to template/default/menubar.tpl
diff --git a/template/yoga/menubar_categories.tpl b/template/default/menubar_categories.tpl
similarity index 100%
rename from template/yoga/menubar_categories.tpl
rename to template/default/menubar_categories.tpl
diff --git a/template/yoga/menubar_identification.tpl b/template/default/menubar_identification.tpl
similarity index 100%
rename from template/yoga/menubar_identification.tpl
rename to template/default/menubar_identification.tpl
diff --git a/template/yoga/menubar_links.tpl b/template/default/menubar_links.tpl
similarity index 100%
rename from template/yoga/menubar_links.tpl
rename to template/default/menubar_links.tpl
diff --git a/template/yoga/menubar_menu.tpl b/template/default/menubar_menu.tpl
similarity index 100%
rename from template/yoga/menubar_menu.tpl
rename to template/default/menubar_menu.tpl
diff --git a/template/yoga/menubar_specials.tpl b/template/default/menubar_specials.tpl
similarity index 100%
rename from template/yoga/menubar_specials.tpl
rename to template/default/menubar_specials.tpl
diff --git a/template/yoga/menubar_tags.tpl b/template/default/menubar_tags.tpl
similarity index 100%
rename from template/yoga/menubar_tags.tpl
rename to template/default/menubar_tags.tpl
diff --git a/template/yoga/month_calendar.tpl b/template/default/month_calendar.tpl
similarity index 100%
rename from template/yoga/month_calendar.tpl
rename to template/default/month_calendar.tpl
diff --git a/template/yoga/navigation_bar.tpl b/template/default/navigation_bar.tpl
similarity index 100%
rename from template/yoga/navigation_bar.tpl
rename to template/default/navigation_bar.tpl
diff --git a/template/yoga/nbm.tpl b/template/default/nbm.tpl
similarity index 100%
rename from template/yoga/nbm.tpl
rename to template/default/nbm.tpl
diff --git a/template/yoga/notification.tpl b/template/default/notification.tpl
similarity index 100%
rename from template/yoga/notification.tpl
rename to template/default/notification.tpl
diff --git a/template/yoga/password.tpl b/template/default/password.tpl
similarity index 100%
rename from template/yoga/password.tpl
rename to template/default/password.tpl
diff --git a/template/yoga/picture.tpl b/template/default/picture.tpl
similarity index 100%
rename from template/yoga/picture.tpl
rename to template/default/picture.tpl
diff --git a/template/yoga/picture_content.tpl b/template/default/picture_content.tpl
similarity index 100%
rename from template/yoga/picture_content.tpl
rename to template/default/picture_content.tpl
diff --git a/template/yoga/picture_nav_buttons.tpl b/template/default/picture_nav_buttons.tpl
similarity index 100%
rename from template/yoga/picture_nav_buttons.tpl
rename to template/default/picture_nav_buttons.tpl
diff --git a/template/yoga/profile.tpl b/template/default/profile.tpl
similarity index 100%
rename from template/yoga/profile.tpl
rename to template/default/profile.tpl
diff --git a/template/yoga/profile_content.tpl b/template/default/profile_content.tpl
similarity index 100%
rename from template/yoga/profile_content.tpl
rename to template/default/profile_content.tpl
diff --git a/template/yoga/redirect.tpl b/template/default/redirect.tpl
similarity index 100%
rename from template/yoga/redirect.tpl
rename to template/default/redirect.tpl
diff --git a/template/yoga/register.tpl b/template/default/register.tpl
similarity index 100%
rename from template/yoga/register.tpl
rename to template/default/register.tpl
diff --git a/template/yoga/search.tpl b/template/default/search.tpl
similarity index 100%
rename from template/yoga/search.tpl
rename to template/default/search.tpl
diff --git a/template/yoga/search_rules.tpl b/template/default/search_rules.tpl
similarity index 100%
rename from template/yoga/search_rules.tpl
rename to template/default/search_rules.tpl
diff --git a/template/yoga/slideshow.tpl b/template/default/slideshow.tpl
similarity index 100%
rename from template/yoga/slideshow.tpl
rename to template/default/slideshow.tpl
diff --git a/template/yoga/tags.tpl b/template/default/tags.tpl
similarity index 100%
rename from template/yoga/tags.tpl
rename to template/default/tags.tpl
diff --git a/template/yoga/thumbnails.tpl b/template/default/thumbnails.tpl
similarity index 100%
rename from template/yoga/thumbnails.tpl
rename to template/default/thumbnails.tpl
diff --git a/template/yoga/upload.tpl b/template/default/upload.tpl
similarity index 100%
rename from template/yoga/upload.tpl
rename to template/default/upload.tpl